diff options
Diffstat (limited to 'widgets/misc')
37 files changed, 32 insertions, 65 deletions
diff --git a/widgets/misc/e-alarm-selector.c b/widgets/misc/e-alarm-selector.c index 3a61663a0c..bdc1b7e35e 100644 --- a/widgets/misc/e-alarm-selector.c +++ b/widgets/misc/e-alarm-selector.c @@ -18,9 +18,6 @@ #include "e-alarm-selector.h" -#include <libedataserver/e-source-alarms.h> -#include <libedataserver/e-source-calendar.h> - G_DEFINE_TYPE ( EAlarmSelector, e_alarm_selector, diff --git a/widgets/misc/e-alarm-selector.h b/widgets/misc/e-alarm-selector.h index 2ad9c49dfc..63500866c9 100644 --- a/widgets/misc/e-alarm-selector.h +++ b/widgets/misc/e-alarm-selector.h @@ -19,7 +19,7 @@ #ifndef E_ALARM_SELECTOR_H #define E_ALARM_SELECTOR_H -#include <libedataserverui/e-source-selector.h> +#include <libedataserverui/libedataserverui.h> /* Standard GObject macros */ #define E_TYPE_ALARM_SELECTOR \ diff --git a/widgets/misc/e-attachment-handler.h b/widgets/misc/e-attachment-handler.h index 81a883deeb..301f789b07 100644 --- a/widgets/misc/e-attachment-handler.h +++ b/widgets/misc/e-attachment-handler.h @@ -22,7 +22,8 @@ #ifndef E_ATTACHMENT_HANDLER_H #define E_ATTACHMENT_HANDLER_H -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> + #include <misc/e-attachment-view.h> /* Standard GObject macros */ diff --git a/widgets/misc/e-attachment-icon-view.c b/widgets/misc/e-attachment-icon-view.c index 26ffe9e056..2be8009e8a 100644 --- a/widgets/misc/e-attachment-icon-view.c +++ b/widgets/misc/e-attachment-icon-view.c @@ -26,7 +26,7 @@ #include "e-attachment-icon-view.h" #include <glib/gi18n.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include "e-attachment.h" #include "e-attachment-store.h" diff --git a/widgets/misc/e-attachment-tree-view.c b/widgets/misc/e-attachment-tree-view.c index 59a9e43436..9a03d54a28 100644 --- a/widgets/misc/e-attachment-tree-view.c +++ b/widgets/misc/e-attachment-tree-view.c @@ -26,7 +26,7 @@ #include "e-attachment-tree-view.h" #include <glib/gi18n.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include "e-attachment.h" #include "e-attachment-store.h" diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index 08b747f926..526bbbb0c2 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -29,7 +29,7 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <libedataserver/e-data-server-util.h> +#include <libedataserver/libedataserver.h> #include "e-util/e-icon-factory.h" #include "e-util/e-util.h" diff --git a/widgets/misc/e-autocomplete-selector.c b/widgets/misc/e-autocomplete-selector.c index 38caa835c4..c0bf207bbd 100644 --- a/widgets/misc/e-autocomplete-selector.c +++ b/widgets/misc/e-autocomplete-selector.c @@ -18,9 +18,6 @@ #include "e-autocomplete-selector.h" -#include <libedataserver/e-source-address-book.h> -#include <libedataserver/e-source-autocomplete.h> - G_DEFINE_TYPE ( EAutocompleteSelector, e_autocomplete_selector, diff --git a/widgets/misc/e-autocomplete-selector.h b/widgets/misc/e-autocomplete-selector.h index 8caa13268e..4e44efc7f3 100644 --- a/widgets/misc/e-autocomplete-selector.h +++ b/widgets/misc/e-autocomplete-selector.h @@ -19,7 +19,7 @@ #ifndef E_AUTOCOMPLETE_SELECTOR_H #define E_AUTOCOMPLETE_SELECTOR_H -#include <libedataserverui/e-source-selector.h> +#include <libedataserverui/libedataserverui.h> /* Standard GObject macros */ #define E_TYPE_AUTOCOMPLETE_SELECTOR \ diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index 173aad8174..4e821e740b 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -25,7 +25,7 @@ #include <config.h> #endif -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include "e-calendar-item.h" #include "ea-widgets.h" @@ -36,7 +36,6 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> -#include <libedataserver/e-data-server-util.h> #include <e-util/e-util.h> static const gint e_calendar_item_days_in_month[12] = { diff --git a/widgets/misc/e-contact-map-window.c b/widgets/misc/e-contact-map-window.c index 4661024036..2d31cc8592 100644 --- a/widgets/misc/e-contact-map-window.c +++ b/widgets/misc/e-contact-map-window.c @@ -30,10 +30,6 @@ #include <champlain/champlain.h> -#include <libebook/e-book-client.h> -#include <libebook/e-book-query.h> -#include <libebook/e-contact.h> - #include <string.h> #include <glib/gi18n.h> diff --git a/widgets/misc/e-contact-map-window.h b/widgets/misc/e-contact-map-window.h index a73ce47e46..821fe243d2 100644 --- a/widgets/misc/e-contact-map-window.h +++ b/widgets/misc/e-contact-map-window.h @@ -23,7 +23,7 @@ #include <gtk/gtk.h> -#include <libebook/e-book-client.h> +#include <libebook/libebook.h> #include <e-contact-map.h> diff --git a/widgets/misc/e-contact-map.c b/widgets/misc/e-contact-map.c index 6e20ac10c9..9d0c6c69ee 100644 --- a/widgets/misc/e-contact-map.c +++ b/widgets/misc/e-contact-map.c @@ -36,8 +36,6 @@ #include <clutter/clutter.h> -#include <libebook/e-contact.h> - #include <string.h> #include <glib/gi18n.h> #include <math.h> diff --git a/widgets/misc/e-contact-map.h b/widgets/misc/e-contact-map.h index a5ff813ad8..d9503e2c9b 100644 --- a/widgets/misc/e-contact-map.h +++ b/widgets/misc/e-contact-map.h @@ -28,7 +28,7 @@ #include <champlain/champlain.h> #include <champlain-gtk/champlain-gtk.h> -#include <libebook/e-contact.h> +#include <libebook/libebook.h> /* Standard GObject macros */ #define E_TYPE_CONTACT_MAP \ diff --git a/widgets/misc/e-contact-marker.h b/widgets/misc/e-contact-marker.h index 996e922e1c..791a9c46b5 100644 --- a/widgets/misc/e-contact-marker.h +++ b/widgets/misc/e-contact-marker.h @@ -25,7 +25,7 @@ #ifdef WITH_CONTACT_MAPS -#include <libebook/e-contact.h> +#include <libebook/libebook.h> #include <champlain/champlain.h> diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 4513aec28f..38b1900e03 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -37,9 +37,9 @@ #include <atk/atkrelation.h> #include <atk/atkrelationset.h> #include <glib/gi18n.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-time-utils.h> -#include <libedataserver/e-data-server-util.h> + +#include <libebackend/libebackend.h> + #include <e-util/e-util.h> #include "e-calendar.h" diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c index c0279ed310..75cee65e3c 100644 --- a/widgets/misc/e-import-assistant.c +++ b/widgets/misc/e-import-assistant.c @@ -32,7 +32,7 @@ #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include <e-util/e-import.h> #include <e-util/e-util-private.h> diff --git a/widgets/misc/e-mail-identity-combo-box.c b/widgets/misc/e-mail-identity-combo-box.c index e43f41d5e4..cfd04b4eda 100644 --- a/widgets/misc/e-mail-identity-combo-box.c +++ b/widgets/misc/e-mail-identity-combo-box.c @@ -18,9 +18,6 @@ #include "e-mail-identity-combo-box.h" -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-identity.h> - #define E_MAIL_IDENTITY_COMBO_BOX_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_IDENTITY_COMBO_BOX, EMailIdentityComboBoxPrivate)) diff --git a/widgets/misc/e-mail-identity-combo-box.h b/widgets/misc/e-mail-identity-combo-box.h index a94e0b2ded..691d69bde2 100644 --- a/widgets/misc/e-mail-identity-combo-box.h +++ b/widgets/misc/e-mail-identity-combo-box.h @@ -20,7 +20,7 @@ #define E_MAIL_IDENTITY_COMBO_BOX_H #include <gtk/gtk.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_IDENTITY_COMBO_BOX \ diff --git a/widgets/misc/e-mail-signature-combo-box.c b/widgets/misc/e-mail-signature-combo-box.c index b2c749a34a..40f0d77744 100644 --- a/widgets/misc/e-mail-signature-combo-box.c +++ b/widgets/misc/e-mail-signature-combo-box.c @@ -21,9 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-mail-signature.h> - #define E_MAIL_SIGNATURE_COMBO_BOX_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_SIGNATURE_COMBO_BOX, EMailSignatureComboBoxPrivate)) diff --git a/widgets/misc/e-mail-signature-combo-box.h b/widgets/misc/e-mail-signature-combo-box.h index 49abc507c0..d3ddaa9694 100644 --- a/widgets/misc/e-mail-signature-combo-box.h +++ b/widgets/misc/e-mail-signature-combo-box.h @@ -20,7 +20,7 @@ #define E_MAIL_SIGNATURE_COMBO_BOX_H #include <gtk/gtk.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_SIGNATURE_COMBO_BOX \ diff --git a/widgets/misc/e-mail-signature-editor.c b/widgets/misc/e-mail-signature-editor.c index 4575fffbb1..34d8a036ad 100644 --- a/widgets/misc/e-mail-signature-editor.c +++ b/widgets/misc/e-mail-signature-editor.c @@ -21,9 +21,6 @@ #include <string.h> #include <glib/gi18n.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-mail-signature.h> - #include <libevolution-utils/e-alert-dialog.h> #include <libevolution-utils/e-alert-sink.h> #include <misc/e-alert-bar.h> diff --git a/widgets/misc/e-mail-signature-editor.h b/widgets/misc/e-mail-signature-editor.h index 5527100bc0..8f1be2dd0f 100644 --- a/widgets/misc/e-mail-signature-editor.h +++ b/widgets/misc/e-mail-signature-editor.h @@ -21,7 +21,7 @@ #include <gtkhtml-editor.h> #include <misc/e-focus-tracker.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_SIGNATURE_EDITOR \ diff --git a/widgets/misc/e-mail-signature-manager.c b/widgets/misc/e-mail-signature-manager.c index d00787b461..0392316756 100644 --- a/widgets/misc/e-mail-signature-manager.c +++ b/widgets/misc/e-mail-signature-manager.c @@ -22,8 +22,7 @@ #include <glib/gstdio.h> #include <gdk/gdkkeysyms.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-mail-signature.h> +#include <libedataserver/libedataserver.h> #include "e-mail-signature-preview.h" #include "e-mail-signature-tree-view.h" diff --git a/widgets/misc/e-mail-signature-preview.c b/widgets/misc/e-mail-signature-preview.c index 02d93283ac..0e7500c5ae 100644 --- a/widgets/misc/e-mail-signature-preview.c +++ b/widgets/misc/e-mail-signature-preview.c @@ -23,8 +23,6 @@ #include <unistd.h> #include <glib/gstdio.h> -#include <libedataserver/e-source-mail-signature.h> - #include <libevolution-utils/e-alert-sink.h> #define E_MAIL_SIGNATURE_PREVIEW_GET_PRIVATE(obj) \ diff --git a/widgets/misc/e-mail-signature-preview.h b/widgets/misc/e-mail-signature-preview.h index 205ff62472..fff4c64d3d 100644 --- a/widgets/misc/e-mail-signature-preview.h +++ b/widgets/misc/e-mail-signature-preview.h @@ -20,7 +20,7 @@ #define E_MAIL_SIGNATURE_PREVIEW_H #include <misc/e-web-view.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_SIGNATURE_PREVIEW \ diff --git a/widgets/misc/e-mail-signature-script-dialog.c b/widgets/misc/e-mail-signature-script-dialog.c index 757f6a4256..58e8c43157 100644 --- a/widgets/misc/e-mail-signature-script-dialog.c +++ b/widgets/misc/e-mail-signature-script-dialog.c @@ -21,8 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-mail-signature.h> - #define E_MAIL_SIGNATURE_SCRIPT_DIALOG_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_SIGNATURE_SCRIPT_DIALOG, \ diff --git a/widgets/misc/e-mail-signature-script-dialog.h b/widgets/misc/e-mail-signature-script-dialog.h index 0b458ab72b..b28521e488 100644 --- a/widgets/misc/e-mail-signature-script-dialog.h +++ b/widgets/misc/e-mail-signature-script-dialog.h @@ -20,7 +20,7 @@ #define E_MAIL_SIGNATURE_SCRIPT_DIALOG_H #include <gtk/gtk.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_SIGNATURE_SCRIPT_DIALOG \ diff --git a/widgets/misc/e-mail-signature-tree-view.c b/widgets/misc/e-mail-signature-tree-view.c index 3dd6a85ec8..f1d5d03753 100644 --- a/widgets/misc/e-mail-signature-tree-view.c +++ b/widgets/misc/e-mail-signature-tree-view.c @@ -18,8 +18,6 @@ #include "e-mail-signature-tree-view.h" -#include <libedataserver/e-source-mail-signature.h> - #define E_MAIL_SIGNATURE_TREE_VIEW_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_SIGNATURE_TREE_VIEW, EMailSignatureTreeViewPrivate)) diff --git a/widgets/misc/e-mail-signature-tree-view.h b/widgets/misc/e-mail-signature-tree-view.h index e3129c9e25..ba2615f6d8 100644 --- a/widgets/misc/e-mail-signature-tree-view.h +++ b/widgets/misc/e-mail-signature-tree-view.h @@ -20,7 +20,7 @@ #define E_MAIL_SIGNATURE_TREE_VIEW_H #include <gtk/gtk.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_SIGNATURE_TREE_VIEW \ diff --git a/widgets/misc/e-source-config-backend.h b/widgets/misc/e-source-config-backend.h index df0e23d84e..72cef5d4d1 100644 --- a/widgets/misc/e-source-config-backend.h +++ b/widgets/misc/e-source-config-backend.h @@ -19,7 +19,7 @@ #ifndef E_SOURCE_CONFIG_BACKEND_H #define E_SOURCE_CONFIG_BACKEND_H -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <misc/e-source-config.h> diff --git a/widgets/misc/e-source-config.c b/widgets/misc/e-source-config.c index 69a238e535..45a3d2d816 100644 --- a/widgets/misc/e-source-config.c +++ b/widgets/misc/e-source-config.c @@ -21,12 +21,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-backend.h> -#include <libedataserver/e-source-refresh.h> -#include <libedataserver/e-source-security.h> -#include <libedataserver/e-source-webdav.h> +#include <libebackend/libebackend.h> #include <e-util/e-marshal.h> #include <misc/e-interval-chooser.h> diff --git a/widgets/misc/e-source-config.h b/widgets/misc/e-source-config.h index 35ad70ff33..da996b69e8 100644 --- a/widgets/misc/e-source-config.h +++ b/widgets/misc/e-source-config.h @@ -20,8 +20,7 @@ #define E_SOURCE_CONFIG_H #include <gtk/gtk.h> -#include <libedataserver/e-source-extension.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_SOURCE_CONFIG \ diff --git a/widgets/misc/e-web-view-gtkhtml.c b/widgets/misc/e-web-view-gtkhtml.c index bca66a72a3..6e426ae76e 100644 --- a/widgets/misc/e-web-view-gtkhtml.c +++ b/widgets/misc/e-web-view-gtkhtml.c @@ -26,14 +26,13 @@ #include <glib/gi18n-lib.h> #include <camel/camel.h> +#include <libebackend/libebackend.h> #include <e-util/e-util.h> #include <e-util/e-plugin-ui.h> #include <libevolution-utils/e-alert-dialog.h> #include <libevolution-utils/e-alert-sink.h> -#include <libebackend/e-extensible.h> - #include "e-popup-action.h" #include "e-selectable.h" diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c index 07f8357609..af71e2831f 100644 --- a/widgets/misc/e-web-view.c +++ b/widgets/misc/e-web-view.c @@ -31,7 +31,7 @@ #include <pango/pango.h> #include <camel/camel.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include <e-util/e-util.h> #include <libevolution-utils/e-alert-dialog.h> diff --git a/widgets/misc/ea-calendar-item.c b/widgets/misc/ea-calendar-item.c index a483460226..aca4b9152c 100644 --- a/widgets/misc/ea-calendar-item.c +++ b/widgets/misc/ea-calendar-item.c @@ -30,7 +30,9 @@ #include <libgnomecanvas/gnome-canvas.h> #include <e-util/e-util.h> #include <glib/gi18n.h> -#include <libedataserver/e-data-server-util.h> + +#include <libedataserver/libedataserver.h> + #include "ea-calendar-item.h" #include "ea-calendar-cell.h" #include "ea-cell-table.h" diff --git a/widgets/misc/test-mail-signatures.c b/widgets/misc/test-mail-signatures.c index 7650195972..597e77effb 100644 --- a/widgets/misc/test-mail-signatures.c +++ b/widgets/misc/test-mail-signatures.c @@ -18,7 +18,7 @@ #include <stdlib.h> -#include <libedataserver/e-source-mail-identity.h> +#include <libedataserver/libedataserver.h> #include <libevolution-utils/e-alert-sink.h> #include <misc/e-mail-identity-combo-box.h> diff --git a/widgets/misc/test-source-config.c b/widgets/misc/test-source-config.c index c7b8ac8932..4a5ce30d91 100644 --- a/widgets/misc/test-source-config.c +++ b/widgets/misc/test-source-config.c @@ -1,7 +1,7 @@ #include <stdlib.h> #include <gtk/gtk.h> -#include <libedataserver/e-source-address-book.h> +#include <libedataserver/libedataserver.h> #include "e-source-config-dialog.h" |