[ede-cvs] SF.net SVN: ede:[2832] trunk/edelib

[<ka...@us...>]

Revision: 2832
          http://ede.svn.sourceforge.net/ede/?rev=2832&view=rev
Author:   karijes
Date:     2009-09-24 16:18:13 +0000 (Thu, 24 Sep 2009)

Log Message:
-----------
dbus_watch_get_fd() is marked as deprecated in newer D-BUS versions

Modified Paths:
--------------
    trunk/edelib/m4/dbus.m4
    trunk/edelib/src/EdbusConnection.cpp

Modified: trunk/edelib/m4/dbus.m4
===================================================================
--- trunk/edelib/m4/dbus.m4	2009-09-24 14:48:18 UTC (rev 2831)
+++ trunk/edelib/m4/dbus.m4	2009-09-24 16:18:13 UTC (rev 2832)
@@ -28,6 +28,25 @@
 			if test "$GCC" = yes; then
 				DBUS_CFLAGS="-Wno-long-long $DBUS_CFLAGS"
 			fi
+
+			dnl newer dbus versions deprecate dbus_watch_get_fd() with dbus_watch_get_unix_fd()
+			AC_MSG_CHECKING([for dbus_watch_get_unix_fd()])
+			AC_LANG_SAVE
+			AC_LANG_C
+			AC_TRY_COMPILE([
+				#include <dbus/dbus.h>
+			],[
+				DBusWatch *ww;
+				dbus_watch_get_unix_fd(ww);
+			],[have_dbus_watch_get_unix_fd=yes],[have_dbus_watch_get_unix_fd=no])
+			AC_LANG_RESTORE
+
+			if test "$have_dbus_watch_get_unix_fd" = yes; then
+				AC_DEFINE(HAVE_DBUS_WATCH_GET_UNIX_FD, 1, [Define to 1 if you have dbus_watch_get_unix_fd()])
+				AC_MSG_RESULT(yes)
+			else
+				AC_MSG_RESULT(no)
+			fi
 		else
 			AC_MSG_RESULT(no)
 			AC_MSG_ERROR([D-Bus libraries not found! Please install them first])

Modified: trunk/edelib/src/EdbusConnection.cpp
===================================================================
--- trunk/edelib/src/EdbusConnection.cpp	2009-09-24 14:48:18 UTC (rev 2831)
+++ trunk/edelib/src/EdbusConnection.cpp	2009-09-24 16:18:13 UTC (rev 2832)
@@ -28,6 +28,11 @@
 #include <edelib/EdbusConnection.h>
 #include <edelib/EdbusObjectPath.h>
 
+/* newer dbus versions deprecate dbus_watch_get_fd */
+#ifdef HAVE_DBUS_WATCH_GET_UNIX_FD
+# define dbus_watch_get_fd dbus_watch_get_unix_fd
+#endif
+
 EDELIB_NS_BEGIN
 
 typedef list<DBusWatch*> WatchList;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.