From ff1145b930b8b4862e23a3ef0147458bfb0cbb80 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 18 Dec 2006 17:04:57 +0000 Subject: [PATCH] 2006-12-18 Dan Williams * gnome/libnm_glib/libnm_glib.c - Change dbus_connection_close() -> dbus_connection_unref() git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2186 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ gnome/libnm_glib/libnm_glib.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88f393747..0f9c4acc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-18 Dan Williams + + * gnome/libnm_glib/libnm_glib.c + - Change dbus_connection_close() -> dbus_connection_unref() + 2006-12-11 Dan Williams * src/supplicant-manager/nm-supplicant-interface.c diff --git a/gnome/libnm_glib/libnm_glib.c b/gnome/libnm_glib/libnm_glib.c index 9a933dd90..a70a54821 100644 --- a/gnome/libnm_glib/libnm_glib.c +++ b/gnome/libnm_glib/libnm_glib.c @@ -230,7 +230,8 @@ 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_close (ctx->dbus_con); + dbus_connection_unref (ctx->dbus_con); + ctx->dbus_con = NULL; libnm_glib_schedule_dbus_watcher (ctx); } else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) @@ -444,7 +445,10 @@ libnm_glib_ctx_free (libnm_glib_ctx *ctx) g_main_loop_unref (ctx->g_main_loop); if (ctx->dbus_con) - dbus_connection_close (ctx->dbus_con); + { + dbus_connection_unref (ctx->dbus_con); + ctx->dbus_con = NULL; + } if (ctx->callbacks_lock) g_mutex_free (ctx->callbacks_lock);