Skip to content
Snippets Groups Projects
Commit 5ded4d32 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'pierre-luc'

parents 2e101c88 d0328320
No related branches found
No related tags found
No related merge requests found
......@@ -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 \
......
......@@ -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;
}
......
......@@ -31,7 +31,6 @@
#include <sys/poll.h>
#include <sys/time.h>
#include <unistd.h>
#include <cstdio>
#include <dbus/dbus.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment