diff --git a/gnome/configure.ac b/gnome/configure.ac index 5c9a46f2d82cc4a604d77a850f94cd2ae39aaab0..51a13d40bd2152b0e8de4ac6ea9c28acbc863d6d 100644 --- a/gnome/configure.ac +++ b/gnome/configure.ac @@ -29,7 +29,8 @@ dnl uninstalled gsr ui dir AC_DEFINE_UNQUOTED(SFLPHONE_UIDIR_UNINSTALLED, "`pwd`/src/", [path to uninstalled SFLphone UI dir]) -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(DBUSGLIB, dbus-glib-1 >= 0.75); + PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.5.0]) if echo "$LIBNOTIFY_LIBS" | grep -q gtk+-x11-2.0; then AC_MSG_ERROR([Your libnotify is linked with GTK+2 ! Install libnotify4-dev]) diff --git a/gnome/src/dbus/dbus.c b/gnome/src/dbus/dbus.c index e157463ca6baa0d4ae5174e44aaf2ce75d9f0302..03006ad5e8a8ef3cf90735307898688627cc69e1 100644 --- a/gnome/src/dbus/dbus.c +++ b/gnome/src/dbus/dbus.c @@ -1025,7 +1025,6 @@ gboolean dbus_connect(GError **error, SFLPhoneClient *client) #endif /* Defines a default timeout for the proxies */ -#if HAVE_DBUS_G_PROXY_SET_DEFAULT_TIMEOUT static const int DEFAULT_DBUS_TIMEOUT = 30000; dbus_g_proxy_set_default_timeout(call_proxy, DEFAULT_DBUS_TIMEOUT); dbus_g_proxy_set_default_timeout(instance_proxy, DEFAULT_DBUS_TIMEOUT); @@ -1035,7 +1034,6 @@ gboolean dbus_connect(GError **error, SFLPhoneClient *client) #endif #ifdef SFL_VIDEO dbus_g_proxy_set_default_timeout(video_proxy, DEFAULT_DBUS_TIMEOUT); -#endif #endif gboolean status = dbus_connect_session_manager(connection);