Commit 2a39437e authored by Matthew Barnes's avatar Matthew Barnes

Adapt to single-include E-D-S libraries.

parent eecffa7a
......@@ -24,7 +24,7 @@
#define __E_CONTACT_EDITOR_FULLNAME_H__
#include <gtk/gtk.h>
#include <libebook/e-contact.h>
#include <libebook/libebook.h>
G_BEGIN_DECLS
......
......@@ -35,11 +35,7 @@
#include <gdk/gdkkeysyms.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libebook/e-address-western.h>
#include <libedataserverui/e-client-utils.h>
#include <libedataserverui/e-categories-dialog.h>
#include <libedataserverui/e-category-completion.h>
#include <libedataserverui/e-source-combo-box.h>
#include <libedataserverui/libedataserverui.h>
#include "addressbook/printing/e-contact-print.h"
#include "addressbook/gui/widgets/eab-gui-util.h"
......
......@@ -25,9 +25,6 @@
#include "addressbook/gui/contact-editor/eab-editor.h"
#include <libebook/e-book-client.h>
#include <libebook/e-contact.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
......
......@@ -28,11 +28,9 @@
#include <string.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libebook/e-book-client.h>
#include <libebook/e-contact.h>
#include <libedataserverui/e-client-utils.h>
#include <libedataserverui/e-source-combo-box.h>
#include <libedataserver/e-source-address-book.h>
#include <libedataserverui/libedataserverui.h>
#include <addressbook/util/eab-book-util.h>
#include "e-contact-editor.h"
#include "e-contact-quick-add.h"
......
......@@ -23,8 +23,7 @@
#ifndef __E_CONTACT_QUICK_ADD_H__
#define __E_CONTACT_QUICK_ADD_H__
#include <libebook/e-contact.h>
#include <libedataserver/e-source-registry.h>
#include <libebook/libebook.h>
typedef void (*EContactQuickAddCallback) (EContact *new_contact,
gpointer closure);
......
......@@ -25,7 +25,7 @@
#define __EAB_EDITOR_H__
#include <gtk/gtk.h>
#include <libebook/e-contact.h>
#include <libebook/libebook.h>
#include <shell/e-shell.h>
/* Standard GObject macros */
......
......@@ -37,8 +37,6 @@
#include <gdk/gdkkeysyms.h>
#include <camel/camel.h>
#include <libedataserverui/e-client-utils.h>
#include <libedataserverui/e-source-combo-box.h>
#include "e-util/e-util.h"
#include "addressbook/gui/widgets/eab-gui-util.h"
......
......@@ -23,14 +23,10 @@
#ifndef __E_CONTACT_LIST_EDITOR_H__
#define __E_CONTACT_LIST_EDITOR_H__
#include <libedataserverui/e-name-selector.h>
#include <libedataserverui/libedataserverui.h>
#include "addressbook/gui/contact-editor/eab-editor.h"
#include <libebook/e-book-client.h>
#include <libebook/e-contact.h>
#include <libebook/e-destination.h>
#define E_TYPE_CONTACT_LIST_EDITOR \
(e_contact_list_editor_get_type ())
#define E_CONTACT_LIST_EDITOR(obj) \
......
......@@ -21,8 +21,7 @@
#define _E_CONTACT_LIST_MODEL_H_
#include <gtk/gtk.h>
#include <libebook/e-contact.h>
#include <libebook/e-destination.h>
#include <libebook/libebook.h>
/* Standard GObject macros */
#define E_TYPE_CONTACT_LIST_MODEL \
......
......@@ -27,9 +27,9 @@
#include <ctype.h>
#include <string.h>
#include <libebook/e-book-query.h>
#include <libedataserver/e-source-registry.h>
#include <libedataserverui/e-client-utils.h>
#include <libedataserverui/libedataserverui.h>
#include "addressbook/util/eab-book-util.h"
#include "eab-contact-compare.h"
......
......@@ -26,9 +26,7 @@
#ifndef __EAB_CONTACT_COMPARE_H__
#define __EAB_CONTACT_COMPARE_H__
#include <libebook/e-contact.h>
#include <libebook/e-book-client.h>
#include <libedataserver/e-source-registry.h>
#include <libebook/libebook.h>
typedef enum {
EAB_CONTACT_MATCH_NOT_APPLICABLE = 0,
......
......@@ -26,8 +26,7 @@
#ifndef __E_CONTACT_MERGING_H__
#define __E_CONTACT_MERGING_H__
#include <libebook/e-book-client.h>
#include <libedataserver/e-source-registry.h>
#include <libebook/libebook.h>
G_BEGIN_DECLS
......
......@@ -21,10 +21,7 @@
#ifndef E_ADDRESSBOOK_MODEL_H
#define E_ADDRESSBOOK_MODEL_H
#include <libebook/e-book-client.h>
#include <libebook/e-book-client-view.h>
#include <libebook/e-book-query.h>
#include <libedataserver/e-source-registry.h>
#include <libebook/libebook.h>
/* Standard GObject macros */
#define E_TYPE_ADDRESSBOOK_MODEL \
......
......@@ -21,8 +21,9 @@
#ifndef _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
#define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
#include <libebook/libebook.h>
#include <text/e-reflow-model.h>
#include <libebook/e-contact.h>
#include "e-addressbook-model.h"
#define E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER (e_addressbook_reflow_adapter_get_type ())
......
......@@ -24,9 +24,6 @@
#include "e-addressbook-selector.h"
#include <libedataserverui/e-client-utils.h>
#include <libedataserver/e-source-address-book.h>
#include <e-util/e-selection.h>
#include <eab-book-util.h>
......
......@@ -21,7 +21,8 @@
#ifndef E_ADDRESSBOOK_SELECTOR_H
#define E_ADDRESSBOOK_SELECTOR_H
#include <libedataserverui/e-source-selector.h>
#include <libedataserverui/libedataserverui.h>
#include "e-addressbook-view.h"
/* Standard GObject macros */
......
......@@ -26,7 +26,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libebook/e-book-client.h>
#include <libebook/libebook.h>
#include "e-addressbook-model.h"
#include "e-addressbook-table-adapter.h"
......
......@@ -41,8 +41,6 @@
#include "e-util/e-print.h"
#include "e-util/e-selection.h"
#include "e-util/e-util.h"
#include "libedataserver/e-sexp.h"
#include <libedataserver/e-categories.h>
#include "gal-view-minicard.h"
#include "gal-view-factory-minicard.h"
......
......@@ -23,8 +23,7 @@
#ifndef E_ADDRESSBOOK_VIEW_H
#define E_ADDRESSBOOK_VIEW_H
#include <libebook/e-book-client.h>
#include <libebook/e-contact.h>
#include <libebook/libebook.h>
#include <menus/gal-view-instance.h>
#include <misc/e-selection-model.h>
......
......@@ -21,10 +21,6 @@
#include <config.h>
#include <glib/gi18n-lib.h>
#include <libedataserver/e-source-address-book.h>
#include <libedataserver/e-source-autocomplete.h>
#include <libedataserver/e-source-offline.h>
#define E_BOOK_SOURCE_CONFIG_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_BOOK_SOURCE_CONFIG, EBookSourceConfigPrivate))
......
......@@ -24,7 +24,8 @@
#define __E_MINICARD_VIEW_WIDGET_H__
#include <misc/e-canvas.h>
#include <libebook/e-book-client.h>
#include <libebook/libebook.h>
#include "e-minicard-view.h"
G_BEGIN_DECLS
......
......@@ -24,8 +24,6 @@
#include <config.h>
#endif
#include <libebook/e-book-client.h>
#include "e-minicard-view.h"
#include "eab-gui-util.h"
......
......@@ -38,7 +38,6 @@
#include "e-minicard-view.h"
#include <e-util/e-html-utils.h>
#include <e-util/e-icon-factory.h>
#include <libebook/e-destination.h>
#include "ea-addressbook.h"
static void e_minicard_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec);
......
......@@ -24,8 +24,8 @@
#define E_MINICARD_H
#include <gtk/gtk.h>
#include <libebook/libebook.h>
#include <libgnomecanvas/libgnomecanvas.h>
#include <libebook/e-contact.h>
/* Standard GObject macros */
#define E_TYPE_MINICARD \
......
......@@ -24,7 +24,8 @@
#ifndef __EAB_CONFIG_H__
#define __EAB_CONFIG_H__
#include <libedataserver/e-source.h>
#include <libedataserver/libedataserver.h>
#include "e-util/e-config.h"
#define EAB_TYPE_CONFIG (eab_config_get_type ())
......
......@@ -23,8 +23,8 @@
#ifndef EAB_CONTACT_DISPLAY_H
#define EAB_CONTACT_DISPLAY_H
#include <libebook/e-contact.h>
#include <libebook/e-destination.h>
#include <libebook/libebook.h>
#include <misc/e-web-view.h>
/* Standard GObject macros */
......
......@@ -17,10 +17,10 @@
#ifndef EAB_CONTACT_FORMATTER_H
#define EAB_CONTACT_FORMATTER_H
#include <libebook/e-contact.h>
#include <addressbook/gui/widgets/eab-contact-display.h>
#include <camel/camel.h>
#include <libebook/libebook.h>
#include <addressbook/gui/widgets/eab-contact-display.h>
/* Standard GObject macros */
#define EAB_TYPE_CONTACT_FORMATTER \
......
......@@ -34,11 +34,9 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libebook/e-destination.h>
#include <libedataserver/e-data-server-util.h>
#include <libedataserver/e-source-address-book.h>
#include <libedataserverui/e-client-utils.h>
#include <libedataserverui/e-source-selector.h>
#include <libedataserverui/libedataserverui.h>
#include <e-util/e-util.h>
#include "eab-gui-util.h"
#include "util/eab-book-util.h"
......
......@@ -25,8 +25,8 @@
#define __E_ADDRESSBOOK_UTIL_H__
#include <gtk/gtk.h>
#include <libebook/e-book-client.h>
#include <libedataserver/e-source-registry.h>
#include <libebook/libebook.h>
#include "libevolution-utils/e-alert-sink.h"
G_BEGIN_DECLS
......
......@@ -29,7 +29,6 @@
#include <libxml/parser.h>
#include <libevolution-utils/e-xml-utils.h>
#include <libedataserver/e-xml-utils.h>
#include "gal-view-minicard.h"
......
......@@ -34,12 +34,8 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <libebook/e-book-client.h>
#include <libedataserverui/e-client-utils.h>
#include <libedataserverui/e-source-selector.h>
#include <libedataserver/e-source-address-book.h>
#include <libebook/e-destination.h>
#include <libebook/libebook.h>
#include <libedataserverui/libedataserverui.h>
#include <shell/e-shell.h>
#include <e-util/e-import.h>
......
......@@ -41,12 +41,8 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <libebook/e-book-client.h>
#include <libedataserverui/e-client-utils.h>
#include <libedataserverui/e-source-selector.h>
#include <libedataserver/e-source-address-book.h>
#include <libebook/e-destination.h>
#include <libebook/libebook.h>
#include <libedataserverui/libedataserverui.h>
#include <shell/e-shell.h>
#include <e-util/e-import.h>
......
......@@ -35,13 +35,10 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <libebook/e-book-client.h>
#include <libedataserverui/e-client-utils.h>
#include <libedataserverui/e-source-selector.h>
#include <libedataserver/e-source-address-book.h>
#include <libebook/libebook.h>
#include <libedataserverui/libedataserverui.h>
#include <util/eab-book-util.h>
#include <libebook/e-destination.h>
#include <shell/e-shell.h>
#include <e-util/e-import.h>
......
......@@ -32,12 +32,6 @@
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
#include <glib/gi18n.h>
#include <libebook/e-book-client.h>
#include <libebook/e-book-client-view.h>
#include <libebook/e-contact.h>
#include <libedataserver/e-flag.h>
#include <libedataserver/e-xml-utils.h>
#include "e-util/e-print.h"
#include "e-util/e-util.h"
......
......@@ -24,8 +24,8 @@
#define E_CONTACT_PRINT_H
#include <gtk/gtk.h>
#include <libebook/e-book-client.h>
#include <libebook/e-book-query.h>
#include <libebook/libebook.h>
#include "e-contact-print-types.h"
void e_contact_print (EBookClient *book_client,
......
......@@ -32,11 +32,7 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <libebook/e-book-client.h>
#include <libebook/e-book-query.h>
#include <libebook/e-contact.h>
#include <libedataserver/e-source-registry.h>
#include <libedataserver/e-source-address-book.h>
#include <libebook/libebook.h>
#include "evolution-addressbook-export.h"
......
......@@ -27,10 +27,7 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <libebook/e-book-client.h>
#include <libebook/e-book-query.h>
#include <libedataserver/e-source-registry.h>
#include <libedataserver/e-source-address-book.h>
#include <libebook/libebook.h>
#include "evolution-addressbook-export.h"
......
......@@ -28,7 +28,7 @@
#include <string.h>
#include <glib/gi18n.h>
#include <libebook/e-book-client.h>
#include <libebook/libebook.h>
#include "evolution-addressbook-export.h"
......
......@@ -24,7 +24,7 @@
#ifndef _EVOLUTION_ADDRESSBOOK_EXPORT_H_
#define _EVOLUTION_ADDRESSBOOK_EXPORT_H__
#include <libedataserver/e-source-registry.h>
#include <libedataserver/libedataserver.h>
G_BEGIN_DECLS
......
......@@ -26,7 +26,6 @@
#endif
#include <string.h>
#include <libedataserver/e-source-registry.h>
#include "eab-book-util.h"
......
......@@ -24,8 +24,7 @@
#ifndef EAB_BOOK_UTIL_H
#define EAB_BOOK_UTIL_H
#include <libebook/e-book-client.h>
#include <libedataserver/e-source-registry.h>
#include <libebook/libebook.h>
G_BEGIN_DECLS
......
......@@ -29,8 +29,7 @@
#include <stdio.h>
#include <string.h>
#include <glib/gi18n.h>
#include <libedataserver/e-time-utils.h>
#include <libecal/e-cal-time-util.h>
#include "alarm-notify-dialog.h"
#include "config-data.h"
#include "util.h"
......
......@@ -25,7 +25,7 @@
#include <time.h>
#include <gtk/gtk.h>
#include <libecal/e-cal-component.h>
#include <libecal/libecal.h>
typedef enum {
ALARM_NOTIFY_CLOSE,
......
......@@ -26,13 +26,6 @@
#include <string.h>
#include <camel/camel.h>
#include <libecal/e-cal-client.h>
#include <libedataserver/e-data-server-util.h>
#include <libedataserver/e-source-alarms.h>
#include <libedataserver/e-source-authentication.h>
#include <libedataserver/e-source-calendar.h>
#include <libedataserver/e-source-registry.h>
#include <libedataserverui/e-client-utils.h>
#include "alarm.h"
#include "alarm-notify.h"
......
......@@ -27,8 +27,8 @@
#define ALARM_NOTIFY_H
#include <gtk/gtk.h>
#include <libecal/e-cal-client.h>
#include <libedataserverui/e-client-utils.h>
#include <libecal/libecal.h>
#include <libedataserverui/libedataserverui.h>
/* Standard GObject macros */
#define TYPE_ALARM_NOTIFY \
......
......@@ -34,10 +34,6 @@
#include <canberra-gtk.h>
#endif
#include <libecal/e-cal-client-view.h>
#include <libecal/e-cal-time-util.h>
#include <libecal/e-cal-component.h>
#ifdef HAVE_LIBNOTIFY
#include <libnotify/notify.h>
#endif
......
......@@ -26,7 +26,7 @@
#ifndef ALARM_QUEUE_H
#define ALARM_QUEUE_H
#include <libecal/e-cal-client.h>
#include <libecal/libecal.h>
void alarm_queue_init (gpointer);
void alarm_queue_done (void);
......
......@@ -27,7 +27,6 @@
#endif
#include <string.h>
#include <libedataserver/e-source-alarms.h>
#include "config-data.h"
/* Whether we have initied ourselves by reading
......
......@@ -27,7 +27,7 @@
#define CONFIG_DATA_H
#include <libical/ical.h>
#include <libecal/e-cal-client.h>
#include <libecal/libecal.h>
icaltimezone * config_data_get_timezone (void);
gboolean config_data_get_24_hour_format (void);
......
......@@ -32,8 +32,6 @@
#include <dbus/dbus-glib.h>
#include <libedataserver/e-gdbus-templates.h>
#include "alarm-notify.h"