summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2008-02-29 14:09:43 +0000
committerBenjamin Otte <otte@src.gnome.org>2008-02-29 14:09:43 +0000
commit47aea7e5a82ef5f80b17a248acf22e8bd5628686 (patch)
treee4eede2ed12b691b5ef387ca9fd5e05c60b1253b /common
parent86a6c9add98830f1b2b2a29563cd2343240db536 (diff)
downloadgvfs-47aea7e5a82ef5f80b17a248acf22e8bd5628686.tar.gz
use the right names for dbus version macros
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 svn path=/trunk/; revision=1458
Diffstat (limited to 'common')
-rw-r--r--common/gdbusutils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/gdbusutils.c b/common/gdbusutils.c
index 7876525e..24a588d5 100644
--- a/common/gdbusutils.c
+++ b/common/gdbusutils.c
@@ -915,7 +915,7 @@ dbus_source_add_watch (DBusSource *dbus_source,
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);