diff options
| author | Milan Crha <mcrha@redhat.com> | 2012-03-16 23:17:27 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-03-16 23:17:27 +0800 |
| commit | ea6e3bd0d5b1f4aadb71719d96ec9c88c8520ac9 (patch) | |
| tree | 89134d1f924a3a523d7e52a8efb4e360fd96edec /shell | |
| parent | 60f3e852e7246e3107b80cfa72a76e0c50753ede (diff) | |
| download | gsoc2013-evolution-ea6e3bd0d5b1f4aadb71719d96ec9c88c8520ac9.tar gsoc2013-evolution-ea6e3bd0d5b1f4aadb71719d96ec9c88c8520ac9.tar.gz gsoc2013-evolution-ea6e3bd0d5b1f4aadb71719d96ec9c88c8520ac9.tar.bz2 gsoc2013-evolution-ea6e3bd0d5b1f4aadb71719d96ec9c88c8520ac9.tar.lz gsoc2013-evolution-ea6e3bd0d5b1f4aadb71719d96ec9c88c8520ac9.tar.xz gsoc2013-evolution-ea6e3bd0d5b1f4aadb71719d96ec9c88c8520ac9.tar.zst gsoc2013-evolution-ea6e3bd0d5b1f4aadb71719d96ec9c88c8520ac9.zip | |
Bug #659756 - Initialize dbus-glib threading for GConf
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 2 | ||||
| -rw-r--r-- | shell/main.c | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index ca722fc00b..3ebf5dcfb1 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -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 diff --git a/shell/main.c b/shell/main.c index 8ba2a9836f..4aa6425b86 100644 --- a/shell/main.c +++ b/shell/main.c @@ -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 (); |