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 /calendar | |
| 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 'calendar')
| -rw-r--r-- | calendar/alarm-notify/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/alarm-notify/notify-main.c | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/calendar/alarm-notify/Makefile.am b/calendar/alarm-notify/Makefile.am index 5647c39254..6de36d0c67 100644 --- a/calendar/alarm-notify/Makefile.am +++ b/calendar/alarm-notify/Makefile.am @@ -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) diff --git a/calendar/alarm-notify/notify-main.c b/calendar/alarm-notify/notify-main.c index a6d9d53fc5..c0d8d725ab 100644 --- a/calendar/alarm-notify/notify-main.c +++ b/calendar/alarm-notify/notify-main.c @@ -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 |