aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/itip-formatter
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-06-04 03:14:03 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-06-04 03:14:03 +0800
commit2a39437ee94059a79d3dc1bf0c97a3aeaff23f53 (patch)
tree657e23e83bad7ff98e891f45043a41b09ff57647 /plugins/itip-formatter
parenteecffa7af35a3eb0742bff4d10be55c3a70f2876 (diff)
downloadgsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar
gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar.gz
gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar.bz2
gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar.lz
gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar.xz
gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar.zst
gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.zip
Adapt to single-include E-D-S libraries.
Diffstat (limited to 'plugins/itip-formatter')
-rw-r--r--plugins/itip-formatter/e-conflict-search-selector.c2
-rw-r--r--plugins/itip-formatter/e-conflict-search-selector.h2
-rw-r--r--plugins/itip-formatter/e-source-conflict-search.h2
-rw-r--r--plugins/itip-formatter/itip-formatter.c8
-rw-r--r--plugins/itip-formatter/itip-view.c7
-rw-r--r--plugins/itip-formatter/itip-view.h3
6 files changed, 7 insertions, 17 deletions
diff --git a/plugins/itip-formatter/e-conflict-search-selector.c b/plugins/itip-formatter/e-conflict-search-selector.c
index c1c1f0ef3b..8f497f5d4f 100644
--- a/plugins/itip-formatter/e-conflict-search-selector.c
+++ b/plugins/itip-formatter/e-conflict-search-selector.c
@@ -18,8 +18,6 @@
#include "e-conflict-search-selector.h"
-#include <libedataserver/e-source-calendar.h>
-
#include "e-source-conflict-search.h"
/* This forces the GType to be registered in a way that
diff --git a/plugins/itip-formatter/e-conflict-search-selector.h b/plugins/itip-formatter/e-conflict-search-selector.h
index 64981d8e55..091e1c9328 100644
--- a/plugins/itip-formatter/e-conflict-search-selector.h
+++ b/plugins/itip-formatter/e-conflict-search-selector.h
@@ -19,7 +19,7 @@
#ifndef E_CONFLICT_SEARCH_SELECTOR_H
#define E_CONFLICT_SEARCH_SELECTOR_H
-#include <libedataserverui/e-source-selector.h>
+#include <libedataserverui/libedataserverui.h>
/* Standard GObject macros */
#define E_TYPE_CONFLICT_SEARCH_SELECTOR \
diff --git a/plugins/itip-formatter/e-source-conflict-search.h b/plugins/itip-formatter/e-source-conflict-search.h
index d574bbd2b9..f91fcc4d43 100644
--- a/plugins/itip-formatter/e-source-conflict-search.h
+++ b/plugins/itip-formatter/e-source-conflict-search.h
@@ -19,7 +19,7 @@
#ifndef E_SOURCE_CONFLICT_SEARCH_H
#define E_SOURCE_CONFLICT_SEARCH_H
-#include <libedataserver/e-source-extension.h>
+#include <libedataserver/libedataserver.h>
/* Standard GObject macros */
#define E_TYPE_SOURCE_CONFLICT_SEARCH \
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index ed5ab58fda..6780d09505 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -28,12 +28,8 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libecal/e-cal-client.h>
-#include <libecal/e-cal-time-util.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserver/e-source-mail-identity.h>
-#include <libedataserverui/e-source-selector.h>
-#include <libedataserverui/e-client-utils.h>
+#include <libecal/libecal.h>
+#include <libedataserverui/libedataserverui.h>
#include <libevolution-utils/e-alert-dialog.h>
#include <e-util/e-mktemp.h>
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 30ec17157c..16388f7232 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -26,11 +26,8 @@
#include <string.h>
#include <glib/gi18n.h>
-#include <libedataserver/e-time-utils.h>
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserverui/e-source-combo-box.h>
-#include <libecal/e-cal-client.h>
-#include <libecal/e-cal-time-util.h>
+#include <libedataserverui/libedataserverui.h>
+
#include <mail/em-format-hook.h>
#include <mail/em-format-html.h>
#include <e-util/e-util.h>
diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h
index d7ebd5b5b1..2e35aec39d 100644
--- a/plugins/itip-formatter/itip-view.h
+++ b/plugins/itip-formatter/itip-view.h
@@ -28,8 +28,7 @@
#include <unistd.h>
#include <gtk/gtk.h>
#include <webkit/webkitdom.h>
-#include <libecal/e-cal-client.h>
-#include <libedataserver/e-source-registry.h>
+#include <libecal/libecal.h>
/* Standard GObject macros */
#define ITIP_TYPE_VIEW \