[Goodies-commits] r1799 - in verve-plugin/trunk: . panel-plugin

[Jannis Pohlmann]

Author: jannis
Date: 2006-07-26 15:53:17 +0000 (Wed, 26 Jul 2006)
New Revision: 1799

Modified:
   verve-plugin/trunk/ChangeLog
   verve-plugin/trunk/configure.in.in
   verve-plugin/trunk/panel-plugin/verve-dbus-service.c
Log:
	* configure.in.in, panel-plugin/verve-dbus-service.c: Add switch to
	  use different D-BUS flags when requesting a service name depending
	  on the available D-BUS version (the flags changed with 0.60).

Modified: verve-plugin/trunk/ChangeLog
===================================================================
--- verve-plugin/trunk/ChangeLog	2006-07-26 11:23:46 UTC (rev 1798)
+++ verve-plugin/trunk/ChangeLog	2006-07-26 15:53:17 UTC (rev 1799)
@@ -1,5 +1,11 @@
-2006-07-25	Jannis Pohlmann <jannis at xfce.org>
+2006-07-26	Jannis Pohlmann <jannis at xfce.org>
 
+	* configure.in.in, panel-plugin/verve-dbus-service.c: Add switch to
+	  use different D-BUS flags when requesting a service name depending
+	  on the available D-BUS version (the flags changed with 0.60).
+
+2006-07-26	Jannis Pohlmann <jannis at xfce.org>
+
 	* panel-plugin/verve-dbus-service-infos.xml: Add the same 'OpenDialog'
 	  method to the 'org.xfce.Verve' interface as we already support in
 	  'org.xfce.RunDialog'.

Modified: verve-plugin/trunk/configure.in.in
===================================================================
--- verve-plugin/trunk/configure.in.in	2006-07-26 11:23:46 UTC (rev 1798)
+++ verve-plugin/trunk/configure.in.in	2006-07-26 15:53:17 UTC (rev 1799)
@@ -81,6 +81,15 @@
 XDT_CHECK_OPTIONAL_PACKAGE([DBUS], [dbus-glib-1],
                            [0.34], [dbus], [D-BUS support])
 
+dnl *******************************************************
+dnl ** Determine if D-BUS version is >= 0.60 in order to **
+dnl ** set correct flags when calling D-BUS functions    **
+dnl *******************************************************
+if $PKG_CONFIG --atleast-version=0.60 dbus-glib-1 >/dev/null 2>&1; then
+  AC_DEFINE([HAVE_DBUS_NEW_FLAGS], [1], [Define if D-BUS version >= 0.60])
+fi
+
+
 dnl ***********************************
 dnl *** Check for debugging support ***
 dnl ***********************************

Modified: verve-plugin/trunk/panel-plugin/verve-dbus-service.c
===================================================================
--- verve-plugin/trunk/panel-plugin/verve-dbus-service.c	2006-07-26 11:23:46 UTC (rev 1798)
+++ verve-plugin/trunk/panel-plugin/verve-dbus-service.c	2006-07-26 15:53:17 UTC (rev 1799)
@@ -135,8 +135,15 @@
     /* Register the /org/xfce/RunDialog object for Verve */
     dbus_g_connection_register_g_object (dbus_service->connection, "/org/xfce/RunDialog", G_OBJECT (dbus_service));
 
+    /* Define D-BUS name request flags */
+#ifdef HAVE_DBUS_NEW_FLAGS
+#define VERVE_DBUS_SERVICE_REQUEST_NAME_FLAGS DBUS_NAME_FLAG_REPLACE_EXISTING|DBUS_NAME_FLAG_ALLOW_REPLACEMENT
+#else
+#define VERVE_DBUS_SERVICE_REQUEST_NAME_FLAGS DBUS_NAME_FLAG_REPLACE_EXISTING|DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
+#endif
+
     /* Request the org.xfce.Verve name for Verve */
-    dbus_bus_request_name (dbus_g_connection_get_connection (dbus_service->connection), "org.xfce.Verve", DBUS_NAME_FLAG_REPLACE_EXISTING|DBUS_NAME_FLAG_ALLOW_REPLACEMENT, NULL);
+    dbus_bus_request_name (dbus_g_connection_get_connection (dbus_service->connection), "org.xfce.Verve", VERVE_DBUS_SERVICE_REQUEST_NAME_FLAGS, NULL);
 
     /* Request the org.xfce.RunDialog name for Verve */
     dbus_bus_request_name (dbus_g_connection_get_connection (dbus_service->connection), "org.xfce.RunDialog", DBUS_NAME_FLAG_REPLACE_EXISTING, NULL);