From 2a39437ee94059a79d3dc1bf0c97a3aeaff23f53 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 3 Jun 2012 15:14:03 -0400
Subject: Adapt to single-include E-D-S libraries.

---
 plugins/save-calendar/csv-format.c     |  9 +--------
 plugins/save-calendar/format-handler.h |  7 ++-----
 plugins/save-calendar/ical-format.c    |  8 +-------
 plugins/save-calendar/rdf-format.c     | 10 ++--------
 plugins/save-calendar/save-calendar.c  |  8 ++------
 5 files changed, 8 insertions(+), 34 deletions(-)

(limited to 'plugins/save-calendar')

diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index 9d5dad8d98..de59cd558c 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -24,15 +24,8 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <libedataserver/e-source.h>
-#include <libecal/e-cal-time-util.h>
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserverui/e-source-selector.h>
-#include <libedataserverui/e-client-utils.h>
-#include <libecal/e-cal-client.h>
 #include <string.h>
+#include <glib/gi18n.h>
 
 #include "format-handler.h"
 
diff --git a/plugins/save-calendar/format-handler.h b/plugins/save-calendar/format-handler.h
index b7376920ef..4a2dbab985 100644
--- a/plugins/save-calendar/format-handler.h
+++ b/plugins/save-calendar/format-handler.h
@@ -20,11 +20,8 @@
  *
  */
 
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-#include <libedataserver/e-source.h>
-#include <libedataserverui/e-source-selector.h>
-#include <libecal/e-cal-client.h>
+#include <libecal/libecal.h>
+#include <libedataserverui/libedataserverui.h>
 
 typedef struct _FormatHandler FormatHandler;
 
diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c
index 01f7ff8ada..da908a1a11 100644
--- a/plugins/save-calendar/ical-format.c
+++ b/plugins/save-calendar/ical-format.c
@@ -25,14 +25,8 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <libedataserver/e-source.h>
-#include <libedataserverui/e-source-selector.h>
-#include <libedataserverui/e-client-utils.h>
-#include <libecal/e-cal-client.h>
-#include <libecal/e-cal-util.h>
 #include <string.h>
+#include <glib/gi18n.h>
 
 #include "format-handler.h"
 
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index a68e570c87..b042ee0fe9 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -24,21 +24,15 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
+#include <string.h>
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
-#include <libedataserver/e-source.h>
-#include <libedataserverui/e-client-utils.h>
-#include <libedataserverui/e-source-selector.h>
-#include <libecal/e-cal-client.h>
-#include <libecal/e-cal-time-util.h>
-#include <libedataserver/e-data-server-util.h>
+
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xmlIO.h>
 #include <libxml/xpath.h>
-#include <string.h>
 
 #include "format-handler.h"
 
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index 818c5a328c..6577335519 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -27,15 +27,11 @@
 #include <config.h>
 #endif
 
-#include <gio/gio.h>
-#include <gtk/gtk.h>
+#include <string.h>
 #include <glib/gi18n.h>
-#include <libedataserver/e-source.h>
-#include <libedataserverui/e-source-selector.h>
-#include <libecal/e-cal-client.h>
+
 #include <libevolution-utils/e-alert-dialog.h>
 #include <e-util/e-plugin.h>
-#include <string.h>
 
 #include <shell/e-shell-sidebar.h>
 #include <shell/e-shell-view.h>
-- 
cgit