dbus version match at compile time for dbus_watch_get_unix_fd, thx TreviƱo
authormcalamelli <mcalamelli@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Wed, 26 Nov 2008 12:04:10 +0000 (12:04 +0000)
committermcalamelli <mcalamelli@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Wed, 26 Nov 2008 12:04:10 +0000 (12:04 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/e_dbus@37810 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/lib/dbus/e_dbus.c

index 42c561c..d4bf889 100644 (file)
@@ -134,7 +134,11 @@ e_dbus_connection_data_watch_add(E_DBus_Connection *cd, DBusWatch *watch)
   hd->watch = watch;
 
   hd->enabled = dbus_watch_get_enabled(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)
   hd->fd = dbus_watch_get_unix_fd(hd->watch);
+#else
+  hd->fd = dbus_watch_get_fd(hd->watch);
+#endif
   DEBUG(5, "watch add (enabled: %d)\n", hd->enabled);
   if (hd->enabled) e_dbus_fd_handler_add(hd);
 }