2006-08-13 Dan Williams <dcbw@redhat.com>
* gnome/libnm_glib/libnm_glib.c - dbus_connection_disconnect() -> dbus_connection_close() for dbus >= 0.90 git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1953 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -1,3 +1,9 @@
|
||||
2006-08-13 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* gnome/libnm_glib/libnm_glib.c
|
||||
- dbus_connection_disconnect() -> dbus_connection_close() for
|
||||
dbus >= 0.90
|
||||
|
||||
2006-08-07 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
Patch from Antony J Mee <A.J.Mee@ncl.ac.uk>
|
||||
|
@@ -230,7 +230,7 @@ libnm_glib_dbus_filter (DBusConnection *connection,
|
||||
{
|
||||
/* Try to reactivate our connection to dbus on the next pass through the event loop */
|
||||
ctx->nm_state = LIBNM_NO_DBUS;
|
||||
dbus_connection_disconnect (ctx->dbus_con);
|
||||
dbus_connection_close (ctx->dbus_con);
|
||||
libnm_glib_schedule_dbus_watcher (ctx);
|
||||
}
|
||||
else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
|
||||
@@ -444,7 +444,7 @@ libnm_glib_ctx_free (libnm_glib_ctx *ctx)
|
||||
g_main_loop_unref (ctx->g_main_loop);
|
||||
|
||||
if (ctx->dbus_con)
|
||||
dbus_connection_disconnect (ctx->dbus_con);
|
||||
dbus_connection_close (ctx->dbus_con);
|
||||
|
||||
if (ctx->callbacks_lock)
|
||||
g_mutex_free (ctx->callbacks_lock);
|
||||
|
Reference in New Issue
Block a user