From ca6348199249989e124c45402ed5b78c1bc92f16 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 Jun 2012 15:40:42 -0400 Subject: Move ECalSourceConfig to /widgets/misc. ECalSourceConfig drags in no additional dependencies, and although we do publish a libevolution-calendar.so, this keeps all the ESource config UI in one place so it can more easily be moved to Evolution-Data-Server. --- modules/cal-config-caldav/evolution-cal-config-caldav.c | 2 +- modules/cal-config-contacts/evolution-cal-config-contacts.c | 2 +- modules/cal-config-google/evolution-cal-config-google.c | 2 +- modules/cal-config-local/evolution-cal-config-local.c | 2 +- modules/cal-config-weather/evolution-cal-config-weather.c | 2 +- modules/cal-config-webcal/evolution-cal-config-webcal.c | 2 +- modules/calendar/e-cal-shell-backend.c | 2 +- modules/calendar/e-cal-shell-view-private.h | 2 +- modules/calendar/e-memo-shell-backend.c | 2 +- modules/calendar/e-memo-shell-view-private.h | 2 +- modules/calendar/e-task-shell-backend.c | 2 +- modules/calendar/e-task-shell-view-private.h | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'modules') diff --git a/modules/cal-config-caldav/evolution-cal-config-caldav.c b/modules/cal-config-caldav/evolution-cal-config-caldav.c index 932f55a059..f6da2dfec9 100644 --- a/modules/cal-config-caldav/evolution-cal-config-caldav.c +++ b/modules/cal-config-caldav/evolution-cal-config-caldav.c @@ -21,9 +21,9 @@ #include +#include #include #include -#include #include "e-caldav-chooser.h" #include "e-caldav-chooser-dialog.h" diff --git a/modules/cal-config-contacts/evolution-cal-config-contacts.c b/modules/cal-config-contacts/evolution-cal-config-contacts.c index daf2127808..5efc8b04e8 100644 --- a/modules/cal-config-contacts/evolution-cal-config-contacts.c +++ b/modules/cal-config-contacts/evolution-cal-config-contacts.c @@ -21,9 +21,9 @@ #include +#include #include #include -#include #include "e-contacts-selector.h" #include "e-source-contacts.h" diff --git a/modules/cal-config-google/evolution-cal-config-google.c b/modules/cal-config-google/evolution-cal-config-google.c index eb2f1337a0..2447e70b8a 100644 --- a/modules/cal-config-google/evolution-cal-config-google.c +++ b/modules/cal-config-google/evolution-cal-config-google.c @@ -21,8 +21,8 @@ #include +#include #include -#include #include "e-google-chooser-button.h" #include "e-google-chooser-dialog.h" diff --git a/modules/cal-config-local/evolution-cal-config-local.c b/modules/cal-config-local/evolution-cal-config-local.c index a8f7696033..2e1200ae02 100644 --- a/modules/cal-config-local/evolution-cal-config-local.c +++ b/modules/cal-config-local/evolution-cal-config-local.c @@ -21,8 +21,8 @@ #include +#include #include -#include #include "e-source-local.h" diff --git a/modules/cal-config-weather/evolution-cal-config-weather.c b/modules/cal-config-weather/evolution-cal-config-weather.c index 28df80eb1f..587be55f15 100644 --- a/modules/cal-config-weather/evolution-cal-config-weather.c +++ b/modules/cal-config-weather/evolution-cal-config-weather.c @@ -25,8 +25,8 @@ #include #undef GWEATHER_I_KNOW_THIS_IS_UNSTABLE +#include #include -#include #include "e-source-weather.h" diff --git a/modules/cal-config-webcal/evolution-cal-config-webcal.c b/modules/cal-config-webcal/evolution-cal-config-webcal.c index 94a209b77f..615afaaee4 100644 --- a/modules/cal-config-webcal/evolution-cal-config-webcal.c +++ b/modules/cal-config-webcal/evolution-cal-config-webcal.c @@ -21,9 +21,9 @@ #include +#include #include #include -#include typedef ESourceConfigBackend ECalConfigWebcal; typedef ESourceConfigBackendClass ECalConfigWebcalClass; diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index a5283b0fe8..0cfe9b89fd 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -34,12 +34,12 @@ #include "shell/e-shell.h" #include "shell/e-shell-backend.h" #include "shell/e-shell-window.h" +#include "widgets/misc/e-cal-source-config.h" #include "widgets/misc/e-preferences-window.h" #include "widgets/misc/e-source-config-dialog.h" #include "calendar/gui/comp-util.h" #include "calendar/gui/dialogs/event-editor.h" -#include "calendar/gui/e-cal-source-config.h" #include "calendar/gui/e-calendar-view.h" #include "calendar/gui/gnome-cal.h" #include "calendar/importers/evolution-calendar-importer.h" diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h index 4a08388736..97641389d7 100644 --- a/modules/calendar/e-cal-shell-view-private.h +++ b/modules/calendar/e-cal-shell-view-private.h @@ -37,6 +37,7 @@ #include +#include #include #include #include @@ -45,7 +46,6 @@ #include #include #include -#include #include #include #include diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c index be69870116..db042cb88b 100644 --- a/modules/calendar/e-memo-shell-backend.c +++ b/modules/calendar/e-memo-shell-backend.c @@ -33,11 +33,11 @@ #include "shell/e-shell.h" #include "shell/e-shell-backend.h" #include "shell/e-shell-window.h" +#include "widgets/misc/e-cal-source-config.h" #include "widgets/misc/e-source-config-dialog.h" #include "calendar/gui/comp-util.h" #include "calendar/gui/dialogs/memo-editor.h" -#include "calendar/gui/e-cal-source-config.h" #include "e-memo-shell-migrate.h" #include "e-memo-shell-view.h" diff --git a/modules/calendar/e-memo-shell-view-private.h b/modules/calendar/e-memo-shell-view-private.h index 84def2810a..4e65d009de 100644 --- a/modules/calendar/e-memo-shell-view-private.h +++ b/modules/calendar/e-memo-shell-view-private.h @@ -31,13 +31,13 @@ #include "e-util/e-file-utils.h" #include "e-util/e-util.h" #include "shell/e-shell-utils.h" +#include "misc/e-cal-source-config.h" #include "misc/e-popup-action.h" #include "misc/e-selectable.h" #include "misc/e-source-config-dialog.h" #include "calendar/gui/comp-util.h" #include "calendar/gui/e-cal-component-preview.h" -#include "calendar/gui/e-cal-source-config.h" #include "calendar/gui/e-calendar-selector.h" #include "calendar/gui/print.h" #include "calendar/gui/dialogs/copy-source-dialog.h" diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c index 7ecad1c986..dd6acb04b1 100644 --- a/modules/calendar/e-task-shell-backend.c +++ b/modules/calendar/e-task-shell-backend.c @@ -33,11 +33,11 @@ #include "shell/e-shell.h" #include "shell/e-shell-backend.h" #include "shell/e-shell-window.h" +#include "widgets/misc/e-cal-source-config.h" #include "widgets/misc/e-source-config-dialog.h" #include "calendar/gui/comp-util.h" #include "calendar/gui/dialogs/task-editor.h" -#include "calendar/gui/e-cal-source-config.h" #include "e-task-shell-content.h" #include "e-task-shell-migrate.h" diff --git a/modules/calendar/e-task-shell-view-private.h b/modules/calendar/e-task-shell-view-private.h index 1bb0c5ce4e..062ac4564b 100644 --- a/modules/calendar/e-task-shell-view-private.h +++ b/modules/calendar/e-task-shell-view-private.h @@ -33,6 +33,7 @@ #include "e-util/e-file-utils.h" #include "e-util/e-util.h" #include "shell/e-shell-utils.h" +#include "misc/e-cal-source-config.h" #include "misc/e-popup-action.h" #include "misc/e-selectable.h" #include "misc/e-source-config-dialog.h" @@ -41,7 +42,6 @@ #include "calendar/gui/comp-util.h" #include "calendar/gui/e-cal-component-preview.h" #include "calendar/gui/e-cal-model-tasks.h" -#include "calendar/gui/e-cal-source-config.h" #include "calendar/gui/e-calendar-selector.h" #include "calendar/gui/print.h" #include "calendar/gui/dialogs/copy-source-dialog.h" -- cgit v1.2.3