Use DBUS_NAME_FLAG_DO_NOT_QUEUE flag in RequestName method when

2006-02-12  Carlos Garcia Campos  <carlosgc@gnome.org>
	* shell/ev-application.c:
	Use DBUS_NAME_FLAG_DO_NOT_QUEUE flag in RequestName method when
	dbus>=0.60, so that the request is not queued.

diff --git a/ChangeLog b/ChangeLog
index 61b2f1e879b34df99a864da555aeafd7b784b58b..fd14ad8a1b83a2c35293483e44f7dd3d750262e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-12  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * shell/ev-application.c: 
+
+       Use DBUS_NAME_FLAG_DO_NOT_QUEUE flag in RequestName method when
+       dbus>=0.60, so that the request is not queued. 
+
 2006-02-10  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * configure.ac:

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 8802f68af267271bb3324a7605353565ba1cc481..c0a7ea2ba9c5eac017ff2f4949813649ca846143 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -73,12 +73,22 @@ ev_application_register_service (EvApplication *application)
                                                  DBUS_PATH_DBUS,
                                                  DBUS_INTERFACE_DBUS);
 
+#if DBUS_VERSION >= 60 
        if (!org_freedesktop_DBus_request_name (driver_proxy,
                                                APPLICATION_SERVICE_NAME,
+                                               DBUS_NAME_FLAG_DO_NOT_QUEUE,
+                                               &request_name_result, &err)) {
+               g_warning ("Service registration failed.");
+               g_clear_error (&err);
+       }
+#else
+       if (!org_freedesktop_DBus_request_name (driver_proxy,
+                                               APPLICATION_SERVICE_NAME,
                                                0, &request_name_result, &err)) {
                g_warning ("Service registration failed.");
                g_clear_error (&err);
        }
+#endif 
 
        if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS) {
                return FALSE;