Commit 5f0be210 authored by Tristan Matthews's avatar Tristan Matthews

* #38044: gnome: dbus-glib is required, not optional

parent 837edc12
......@@ -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])
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment