aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-06-15 15:04:08 +0800
committerMilan Crha <mcrha@redhat.com>2012-06-15 15:04:08 +0800
commit94daae3dba8e86e88f69320bc82795fe660ec9cd (patch)
tree9965d4f6dfc6d48adecd0b9084442185d73d58c7 /calendar
parent08dedf0a8a520b55c51a8117dc015915ec39f7fe (diff)
downloadgsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar
gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.gz
gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.bz2
gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.lz
gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.xz
gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.zst
gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.zip
Remove the last remaining usage of GConf
Diffstat (limited to 'calendar')
-rw-r--r--calendar/alarm-notify/Makefile.am2
-rw-r--r--calendar/alarm-notify/notify-main.c5
-rw-r--r--calendar/gui/e-memo-list-selector.c1
3 files changed, 0 insertions, 8 deletions
diff --git a/calendar/alarm-notify/Makefile.am b/calendar/alarm-notify/Makefile.am
index 50cd85628b..775a3693cb 100644
--- a/calendar/alarm-notify/Makefile.am
+++ b/calendar/alarm-notify/Makefile.am
@@ -21,7 +21,6 @@ evolution_alarm_notify_CPPFLAGS = \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
$(CANBERRA_CFLAGS)
ui_DATA = \
@@ -55,7 +54,6 @@ 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 0ddfc5866b..2b04104417 100644
--- a/calendar/alarm-notify/notify-main.c
+++ b/calendar/alarm-notify/notify-main.c
@@ -30,8 +30,6 @@
#include <stdlib.h>
#include <glib/gi18n.h>
-#include <dbus/dbus-glib.h>
-
#include "alarm-notify.h"
#ifdef G_OS_WIN32
@@ -84,9 +82,6 @@ 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
diff --git a/calendar/gui/e-memo-list-selector.c b/calendar/gui/e-memo-list-selector.c
index 3e5623081a..8da45b68f3 100644
--- a/calendar/gui/e-memo-list-selector.c
+++ b/calendar/gui/e-memo-list-selector.c
@@ -19,7 +19,6 @@
*/
#include <config.h>
-#include <gconf/gconf-client.h>
#include "e-memo-list-selector.h"