[Xfce4-commits] [apps/xfce4-screensaver] 60/425: prevent mate-screensaver to launch a 2nd instance

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit ca4b57cdd02c223763c9d60742630127340bbeee
Author: Nelson Marques <nmo.marques at gmail.com>
Date:   Wed Dec 5 16:12:28 2012 +0000

    prevent mate-screensaver to launch a 2nd instance
---
 src/gs-listener-dbus.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index ed1199f..99e05df 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -2204,7 +2204,7 @@ gboolean
 gs_listener_acquire (GSListener *listener,
                      GError    **error)
 {
-	gboolean  acquired;
+        int       acquired;
 	DBusError buserror;
 	gboolean  is_connected;
 
@@ -2254,7 +2254,8 @@ gs_listener_acquire (GSListener *listener,
 
 	acquired = dbus_bus_request_name (listener->priv->connection,
 	                                  GS_LISTENER_SERVICE,
-	                                  0, &buserror) != -1;
+	                                  DBUS_NAME_FLAG_DO_NOT_QUEUE,
+	                                  &buserror);
 	if (dbus_error_is_set (&buserror))
 	{
 		g_set_error (error,
@@ -2263,6 +2264,14 @@ gs_listener_acquire (GSListener *listener,
 		             "%s",
 		             buserror.message);
 	}
+	if (acquired == DBUS_REQUEST_NAME_REPLY_EXISTS) {
+	        g_set_error (error,
+	                     GS_LISTENER_ERROR,
+	                     GS_LISTENER_ERROR_ACQUISITION_FAILURE,
+	                     "%s",
+	                     _("screensaver already running in this session"));
+	        return FALSE;
+        }
 
 	dbus_error_free (&buserror);
 
@@ -2331,7 +2340,7 @@ gs_listener_acquire (GSListener *listener,
 	}
 
 finish:
-	return acquired;
+        return (acquired != -1);
 }
 
 static char *

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.