gvfs r1458 - in trunk: . common daemon

[otte svn gnome org]

Author: otte
Date: Fri Feb 29 14:09:43 2008
New Revision: 1458
URL: http://svn.gnome.org/viewvc/gvfs?rev=1458&view=rev

Log:
2008-02-29  Benjamin Otte  <otte gnome org>

	* common/gdbusutils.c: (dbus_source_add_watch):
	* daemon/dbus-gmain.c: (connection_setup_add_watch):
	use the right names for dbus version macros



Modified:
   trunk/ChangeLog
   trunk/common/gdbusutils.c
   trunk/daemon/dbus-gmain.c

Modified: trunk/common/gdbusutils.c
==============================================================================
--- trunk/common/gdbusutils.c	(original)
+++ trunk/common/gdbusutils.c	Fri Feb 29 14:09:43 2008
@@ -915,7 +915,7 @@
   handler->dbus_source = dbus_source;
   handler->watch = watch;
 
-#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
+#if (DBUS_MAJOR_VERSION == 1 && DBUS_MINOR_VERSION == 1 && DBUS_MICRO_VERSION >= 1) || (DBUS_MAJOR_VERSION == 1 && DBUS_MINOR_VERSION > 1) || (DBUS_MAJOR_VERSION > 1)
   fd = dbus_watch_get_unix_fd (watch);
 #else
   fd = dbus_watch_get_fd (watch);

Modified: trunk/daemon/dbus-gmain.c
==============================================================================
--- trunk/daemon/dbus-gmain.c	(original)
+++ trunk/daemon/dbus-gmain.c	Fri Feb 29 14:09:43 2008
@@ -292,7 +292,7 @@
   handler->cs = cs;
   handler->watch = watch;
   
-#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
+#if (DBUS_MAJOR_VERSION == 1 && DBUS_MINOR_VERSION == 1 && DBUS_MICRO_VERSION >= 1) || (DBUS_MAJOR_VERSION == 1 && DBUS_MINOR_VERSION > 1) || (DBUS_MAJOR_VERSION > 1)
   fd = dbus_watch_get_unix_fd (watch);
 #else
   fd = dbus_watch_get_fd (watch);