[GnomeMeeting-devel-list] [PATCH] simple fix for compiling the dbus plugin

[Damien Ciabrini <Damien Ciabrini sophia inria fr>]

Hi

Attached is a simple fix that enables the compilation of GM Opal (as
found in Damien's snapshot of Dec 24th) with the latest dbus 0.60. I
haven't checked the CVS yet... so maybe Snark has already fixed it :)

-- 
Damien

--- gnomemeeting-opal/src/dbus_component.cpp	2005-12-04 20:05:20.000000000 +0100
+++ gnomemeeting-opal-new/src/dbus_component.cpp	2005-12-29 17:24:52.000000000 +0100
@@ -635,7 +635,8 @@
   DBusGProxy *bus_proxy = NULL;
   guint request_name_result;
   GError *error = NULL;
-
+  int flags;
+  
   /* in case we are called automatically */
   if (data->owner)
     return TRUE;
@@ -650,10 +651,16 @@
   bus_proxy = dbus_g_proxy_new_for_name (bus, "org.freedesktop.DBus",
                                          "/org/freedesktop/DBus",
                                          "org.freedesktop.DBus");
-
+	
+#ifndef DBUS_NAME_FLAG_DO_NOT_QUEUE
+  flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
+#else
+  flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;
+#endif
+  
   if (!dbus_g_proxy_call (bus_proxy, "RequestName", &error,
                           G_TYPE_STRING, "net.gnomemeeting.instance",
-                          G_TYPE_UINT, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
+                          G_TYPE_UINT, flags,
                           G_TYPE_INVALID,
                           G_TYPE_UINT, &request_name_result,
                           G_TYPE_INVALID)) {
--- gnomemeeting-opal/src/dbus-helper.cpp	2005-12-04 20:05:20.000000000 +0100
+++ gnomemeeting-opal-new/src/dbus-helper.cpp	2005-12-29 17:25:56.000000000 +0100
@@ -162,7 +162,8 @@
   DBusGProxy *bus_proxy = NULL;
   guint request_name_result;
   GError *error = NULL;
-
+  int flags;
+  
   g_type_init ();
 
   mainloop = g_main_loop_new (NULL, FALSE);
@@ -179,9 +180,15 @@
                                          "/org/freedesktop/DBus",
                                          "org.freedesktop.DBus");
 
+#ifndef DBUS_NAME_FLAG_DO_NOT_QUEUE
+  flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
+#else
+  flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;
+#endif
+
   if (!dbus_g_proxy_call (bus_proxy, "RequestName", &error,
                           G_TYPE_STRING, GM_HELPER_SERVICE,
-                          G_TYPE_UINT, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
+                          G_TYPE_UINT, flags,
                           G_TYPE_INVALID,
                           G_TYPE_UINT, &request_name_result,
                           G_TYPE_INVALID)) {