From a3cb68f63b899f5b7ea61838eaf3ade5a8c4eac9 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Sun, 12 Feb 2006 18:26:25 +0000
Subject: 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.
---
(limited to 'shell')

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 8802f68..c0a7ea2 100644
--- 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;
--
cgit v0.9.1