Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
5f0be210
Commit
5f0be210
authored
11 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #38044: gnome: dbus-glib is required, not optional
parent
837edc12
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
gnome/configure.ac
+2
-1
2 additions, 1 deletion
gnome/configure.ac
gnome/src/dbus/dbus.c
+0
-2
0 additions, 2 deletions
gnome/src/dbus/dbus.c
with
2 additions
and
3 deletions
gnome/configure.ac
+
2
−
1
View file @
5f0be210
...
...
@@ -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])
...
...
This diff is collapsed.
Click to expand it.
gnome/src/dbus/dbus.c
+
0
−
2
View file @
5f0be210
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment