gvfs r1379 - in trunk: . common daemon

[alexl svn gnome org]

Author: alexl
Date: Mon Feb 25 21:21:26 2008
New Revision: 1379
URL: http://svn.gnome.org/viewvc/gvfs?rev=1379&view=rev

Log:
2008-02-25  Alexander Larsson  <alexl redhat com>

        * common/gdbusutils.c:
        * daemon/dbus-gmain.c:
	Only use dbus_watch_get_unix_fd for
	dbus >= 1.1.1




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	Mon Feb 25 21:21:26 2008
@@ -896,6 +896,7 @@
   guint flags;
   GIOCondition condition;
   IOHandler *handler;
+  int fd;
 
   if (!dbus_watch_get_enabled (watch))
     return;
@@ -914,8 +915,13 @@
   handler->dbus_source = dbus_source;
   handler->watch = watch;
 
-  handler->source = __g_fd_source_new (dbus_watch_get_unix_fd (watch),
-				       condition, NULL);
+#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)
+  fd = dbus_watch_get_unix_fd (watch);
+#else
+  fd = dbus_watch_get_fd (watch);
+#endif
+    
+  handler->source = __g_fd_source_new (fd, condition, NULL);
   g_source_set_callback (handler->source,
 			 (GSourceFunc) io_handler_dispatch, handler,
                          NULL);

Modified: trunk/daemon/dbus-gmain.c
==============================================================================
--- trunk/daemon/dbus-gmain.c	(original)
+++ trunk/daemon/dbus-gmain.c	Mon Feb 25 21:21:26 2008
@@ -273,6 +273,7 @@
   GIOCondition condition;
   GIOChannel *channel;
   IOHandler *handler;
+  int fd;
   
   if (!dbus_watch_get_enabled (watch))
     return;
@@ -291,7 +292,12 @@
   handler->cs = cs;
   handler->watch = watch;
   
-  channel = g_io_channel_unix_new (dbus_watch_get_unix_fd (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)
+  fd = dbus_watch_get_unix_fd (watch);
+#else
+  fd = dbus_watch_get_fd (watch);
+#endif
+  channel = g_io_channel_unix_new (fd);
   
   handler->source = g_io_create_watch (channel, condition);
   g_source_set_callback (handler->source, (GSourceFunc) io_handler_dispatch, handler,