callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #659756 - Initialize dbus-glib threading for GConf

Browse Source
This commit is contained in:
Milan Crha
2012-03-16 16:17:27 +01:00
parent 60f3e852e7
commit ea6e3bd0d5
5 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/alarm-notify/Makefile.am
View File

@ -21,6 +21,7 @@ evolution_alarm_notify_CPPFLAGS = \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(CANBERRA_CFLAGS)
ui_DATA = \
@ -49,6 +50,7 @@ evolution_alarm_notify_LDADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(LIBNOTIFY_LIBS) \
$(DBUS_GLIB_LIBS) \
$(CANBERRA_LIBS) \
$(EVOLUTIONALARMNOTIFYICON)

5
calendar/alarm-notify/notify-main.c
View File

@ -30,6 +30,8 @@
#include <stdlib.h>
#include <glib/gi18n.h>
#include <dbus/dbus-glib.h>
#include <libedataserver/e-gdbus-templates.h>
#include "alarm-notify.h"
@ -84,6 +86,9 @@ main (gint argc,
gtk_init (&argc, &argv);
/* this is to initialize threading for dbus-glib used by GConf */
dbus_g_thread_init ();
e_gdbus_templates_init_main_thread ();
#ifdef G_OS_WIN32

9
configure.ac
View File

@ -265,6 +265,15 @@ PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER],
AC_SUBST(EVOLUTION_DATA_SERVER_CFLAGS)
AC_SUBST(EVOLUTION_DATA_SERVER_LIBS)
dnl ******************************
dnl DBus-glib stuff, to initialize thread for GConf, which is using it
dnl this is returned back only temporarily and wil lbe removed as soon
dnl as eds will stop using GConf completely
dnl ******************************
PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.6)
AC_SUBST(DBUS_GLIB_CFLAGS)
AC_SUBST(DBUS_GLIB_LIBS)
dnl ******************************
dnl Canberra / Canberra-GTK Sound
dnl ******************************

2
shell/Makefile.am
View File

@ -62,6 +62,7 @@ libeshell_la_CPPFLAGS = \
$(GNOME_PLATFORM_CFLAGS) \
$(EGG_SMCLIENT_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(CLUTTER_CFLAGS)
libeshell_la_SOURCES = \
@ -100,6 +101,7 @@ libeshell_la_LIBADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(EGG_SMCLIENT_LIBS) \
$(DBUS_GLIB_LIBS) \
$(CLUTTER_LIBS)
# Evolution executable

5
shell/main.c
View File

@ -30,6 +30,8 @@
#include <glib-unix.h>
#endif
#include <dbus/dbus-glib.h>
#if HAVE_CLUTTER
#include <clutter-gtk/clutter-gtk.h>
#include <mx/mx.h>
@ -497,6 +499,9 @@ main (gint argc,
g_type_init ();
/* this is to initialize threading for dbus-glib used by GConf */
dbus_g_thread_init ();
/* do not require Gtk+ for --force-shutdown */
if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) {
shell_force_shutdown ();