From acb311bba7c6cbac4df2f7c51ffcf8f928272b1b Mon Sep 17 00:00:00 2001 From: jrl Date: Fri, 21 Jul 2006 04:36:15 +0000 Subject: [PATCH] * metadata/rb-metadata-dbus-client.c: (kill_metadata_service): * metadata/rb-metadata-dbus-service.c: (main): Replace calls to deprecated dbus_connection_disconnect () with dbus_connection_close (). Fixes #348098. --- ChangeLog | 7 +++++++ metadata/rb-metadata-dbus-client.c | 4 ++++ metadata/rb-metadata-dbus-service.c | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9a9897e2..be4fe022 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-07-20 Claudio Saavedra + + * metadata/rb-metadata-dbus-client.c: (kill_metadata_service): + * metadata/rb-metadata-dbus-service.c: (main): Replace calls to + deprecated dbus_connection_disconnect () with dbus_connection_close (). + Fixes #348098. + 2006-07-20 James Livingston * widgets/rb-entry-view.c: (type_ahead_search_func): check the strings diff --git a/metadata/rb-metadata-dbus-client.c b/metadata/rb-metadata-dbus-client.c index ee399cff..eeb9fc36 100644 --- a/metadata/rb-metadata-dbus-client.c +++ b/metadata/rb-metadata-dbus-client.c @@ -119,7 +119,11 @@ kill_metadata_service (void) if (dbus_connection) { if (dbus_connection_get_is_connected (dbus_connection)) { rb_debug ("closing dbus connection"); +#ifdef WITH_OLD_DBUS dbus_connection_disconnect (dbus_connection); +#else + dbus_connection_close (dbus_connection); +#endif } else { rb_debug ("dbus connection already closed"); } diff --git a/metadata/rb-metadata-dbus-service.c b/metadata/rb-metadata-dbus-service.c index a7a31e59..67bec092 100644 --- a/metadata/rb-metadata-dbus-service.c +++ b/metadata/rb-metadata-dbus-service.c @@ -501,7 +501,11 @@ main (int argc, char **argv) g_main_loop_run (svc.loop); if (svc.connection) { +#ifdef WITH_OLD_DBUS dbus_connection_disconnect (svc.connection); +#else + dbus_connection_close (svc.connection); +#endif dbus_connection_unref (svc.connection); } -- 2.11.4.GIT