blob: b8eb5f85063e6fa813cd38a23ff16792c3300bdf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
diff --exclude-from=/home/dang/.diffrc -up -ruN epiphany-2.16.1.orig/src/ephy-dbus.c epiphany-2.16.1/src/ephy-dbus.c
--- epiphany-2.16.1.orig/src/ephy-dbus.c 2006-09-13 07:48:50.000000000 -0400
+++ epiphany-2.16.1/src/ephy-dbus.c 2006-11-17 11:20:53.000000000 -0500
@@ -301,16 +301,6 @@ ephy_dbus_connect_to_session_bus (EphyDb
return TRUE;
}
-static void
-ephy_dbus_disconnect_bus (DBusGConnection *bus)
-{
- if (bus != NULL) {
- dbus_connection_close
- (dbus_g_connection_get_connection (bus));
- dbus_g_connection_unref (bus);
- }
-}
-
/* Public methods */
static void
@@ -337,7 +327,7 @@ ephy_dbus_shutdown (EphyDbus *dbus)
dbus_connection_remove_filter
(dbus_g_connection_get_connection (priv->session_bus),
session_filter_func, dbus);
- ephy_dbus_disconnect_bus (priv->session_bus);
+ dbus_g_connection_unref (priv->session_bus);
priv->session_bus = NULL;
}
@@ -346,7 +336,7 @@ ephy_dbus_shutdown (EphyDbus *dbus)
dbus_connection_remove_filter
(dbus_g_connection_get_connection (priv->system_bus),
system_filter_func, dbus);
- ephy_dbus_disconnect_bus (priv->system_bus);
+ dbus_g_connection_unref (priv->system_bus);
priv->system_bus = NULL;
}
}
|
GitWeb
