From 454deed81b7fc285486a8e34571025cfb4ca3b1e Mon Sep 17 00:00:00 2001
From: pierre-luc <pierre-luc@aqra.ca>
Date: Mon, 20 Jul 2009 11:19:25 -0400
Subject: [PATCH] [#1869] Conditional compilation that checks if
dbus_g_proxy_set_default_timeout is present (since version 0.75).
---
sflphone-client-gnome/configure.ac | 2 ++
sflphone-client-gnome/src/dbus/dbus.c | 3 +++
sflphone-common/libs/dbus-c++/src/eventloop.cpp | 1 -
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/sflphone-client-gnome/configure.ac b/sflphone-client-gnome/configure.ac
index ed4dbaeb59..8de0453db7 100644
--- a/sflphone-client-gnome/configure.ac
+++ b/sflphone-client-gnome/configure.ac
@@ -46,6 +46,8 @@ fi
AC_SUBST(LIBSEXY_CFLAGS)
AC_SUBST(LIBSEXY_LIBS)
+PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1 >= 0.75, HAVE_DBUS_G_PROXY_SET_DEFAULT_TIMEOUT=true, HAVE_DBUS_G_PROXY_SET_DEFAULT_TIMEOUT=false);
+
PKG_CHECK_MODULES(DEPS, \
dbus-glib-1 >= 0.35 \
libnotify >= 0.4 \
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index 9737e794dc..5e83cbb037 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -18,6 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <config.h>
#include <calltab.h>
#include <callmanager-glue.h>
@@ -393,9 +394,11 @@ dbus_connect ()
"errorAlert", G_CALLBACK(error_alert), NULL, NULL);
/* Defines a default timeout for the proxies */
+#if HAVE_DBUS_G_PROXY_SET_DEFAULT_TIMEOUT
dbus_g_proxy_set_default_timeout(callManagerProxy, DEFAULT_DBUS_TIMEOUT);
dbus_g_proxy_set_default_timeout(instanceProxy, DEFAULT_DBUS_TIMEOUT);
dbus_g_proxy_set_default_timeout(configurationManagerProxy, DEFAULT_DBUS_TIMEOUT);
+#endif
return TRUE;
}
diff --git a/sflphone-common/libs/dbus-c++/src/eventloop.cpp b/sflphone-common/libs/dbus-c++/src/eventloop.cpp
index b1ce7af689..30a5d6b8c3 100644
--- a/sflphone-common/libs/dbus-c++/src/eventloop.cpp
+++ b/sflphone-common/libs/dbus-c++/src/eventloop.cpp
@@ -31,7 +31,6 @@
#include <sys/poll.h>
#include <sys/time.h>
#include <unistd.h>
-#include <cstdio>
#include <dbus/dbus.h>
--
GitLab