[vino] Fix a regression that allows more than one instance od the server to run.



commit d6ed6507644ceee8a2abcefdb105f450a7dfb022
Author: Jonh Wendell <jwendell gnome org>
Date:   Fri Aug 28 10:52:13 2009 -0300

    Fix a regression that allows more than one instance od the server to run.
    
    It was introduced in Telepathy Tube stuff.

 server/vino-dbus-listener.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/server/vino-dbus-listener.c b/server/vino-dbus-listener.c
index 9407d01..e980d41 100644
--- a/server/vino-dbus-listener.c
+++ b/server/vino-dbus-listener.c
@@ -426,9 +426,9 @@ vino_dbus_request_name (void)
 {
 
   DBusGConnection *connection;
-  GError *error = NULL;
-  DBusGProxy     *bus_proxy;
-  int request_name_result;
+  DBusGProxy      *bus_proxy;
+  guint           request_name_result;
+  GError          *error = NULL;
 
   if (!(connection = vino_dbus_get_connection ()))
     return FALSE;
@@ -441,9 +441,14 @@ vino_dbus_request_name (void)
       "/org/freedesktop/DBus",
       "org.freedesktop.DBus");
 
-  if (!dbus_g_proxy_call(bus_proxy, "RequestName", &error, 
-      G_TYPE_STRING, VINO_DBUS_BUS_NAME, G_TYPE_UINT, 0, G_TYPE_INVALID,
-      G_TYPE_UINT, &request_name_result, G_TYPE_INVALID))
+  if (!dbus_g_proxy_call (bus_proxy,
+			  "RequestName",
+			  &error,
+			  G_TYPE_STRING, VINO_DBUS_BUS_NAME,
+			  G_TYPE_UINT, DBUS_NAME_FLAG_DO_NOT_QUEUE,
+			  G_TYPE_INVALID,
+			  G_TYPE_UINT, &request_name_result,
+			  G_TYPE_INVALID))
     {
       g_debug ("Failed to request name: %s",
                 error ? error->message : "No error given");



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]