diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2012-06-14 23:49:41 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2012-06-15 01:40:11 +0800 |
commit | 2a4a12c470586ae39a2ce5b81cd19749168c371f (patch) | |
tree | dc2ea8a514c6224470a98e88c8d3dd06f37c9b57 /modules | |
parent | e439e17e2e14fc5a3a35924dddfdd4d8602c3d8c (diff) | |
download | gsoc2013-evolution-2a4a12c470586ae39a2ce5b81cd19749168c371f.tar gsoc2013-evolution-2a4a12c470586ae39a2ce5b81cd19749168c371f.tar.gz gsoc2013-evolution-2a4a12c470586ae39a2ce5b81cd19749168c371f.tar.bz2 gsoc2013-evolution-2a4a12c470586ae39a2ce5b81cd19749168c371f.tar.lz gsoc2013-evolution-2a4a12c470586ae39a2ce5b81cd19749168c371f.tar.xz gsoc2013-evolution-2a4a12c470586ae39a2ce5b81cd19749168c371f.tar.zst gsoc2013-evolution-2a4a12c470586ae39a2ce5b81cd19749168c371f.zip |
Move EBookSourceConfig to /widgets/misc.
EBookSourceConfig drags in no additional dependencies, and allows us to
delay publishing a libevolution-addressbook.so since 3rd party packages
will need to subclass EBookSourceConfig.
The address book source code will need to be flattened into a single
library before we could publish a libevolution-addressbook.so anyway.
That would be a good thing to do regardless -- Evolution has way too
many internal libraries -- but it's out of scope at the moment.
Diffstat (limited to 'modules')
7 files changed, 7 insertions, 7 deletions
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c index 8aa7070af6..b2da5b9072 100644 --- a/modules/addressbook/e-book-shell-backend.c +++ b/modules/addressbook/e-book-shell-backend.c @@ -33,11 +33,11 @@ #include "e-util/e-import.h" #include "shell/e-shell.h" #include "shell/e-shell-window.h" +#include "widgets/misc/e-book-source-config.h" #include "widgets/misc/e-preferences-window.h" #include "widgets/misc/e-source-config-dialog.h" #include "addressbook/gui/widgets/eab-gui-util.h" -#include "addressbook/gui/widgets/e-book-source-config.h" #include "addressbook/gui/contact-editor/e-contact-editor.h" #include "addressbook/gui/contact-editor/e-contact-quick-add.h" #include "addressbook/gui/contact-list-editor/e-contact-list-editor.h" diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h index 928e5e2eb9..8338476f5e 100644 --- a/modules/addressbook/e-book-shell-view-private.h +++ b/modules/addressbook/e-book-shell-view-private.h @@ -36,6 +36,7 @@ #include "shell/e-shell-searchbar.h" #include "shell/e-shell-sidebar.h" #include "shell/e-shell-utils.h" +#include "misc/e-book-source-config.h" #include "misc/e-popup-action.h" #include "misc/e-selectable.h" #include "misc/e-source-config-dialog.h" @@ -46,7 +47,6 @@ #include "addressbook/gui/widgets/eab-gui-util.h" #include "addressbook/gui/widgets/e-addressbook-view.h" #include "addressbook/gui/widgets/e-addressbook-selector.h" -#include "addressbook/gui/widgets/e-book-source-config.h" #include "e-book-shell-backend.h" #include "e-book-shell-content.h" diff --git a/modules/book-config-google/evolution-book-config-google.c b/modules/book-config-google/evolution-book-config-google.c index 3d49be1f12..858991a9ee 100644 --- a/modules/book-config-google/evolution-book-config-google.c +++ b/modules/book-config-google/evolution-book-config-google.c @@ -21,9 +21,9 @@ #include <libebackend/libebackend.h> +#include <misc/e-book-source-config.h> #include <misc/e-interval-chooser.h> #include <misc/e-source-config-backend.h> -#include <addressbook/gui/widgets/e-book-source-config.h> typedef ESourceConfigBackend EBookConfigGoogle; typedef ESourceConfigBackendClass EBookConfigGoogleClass; diff --git a/modules/book-config-ldap/evolution-book-config-ldap.c b/modules/book-config-ldap/evolution-book-config-ldap.c index e174783f6f..5dd0c9ec77 100644 --- a/modules/book-config-ldap/evolution-book-config-ldap.c +++ b/modules/book-config-ldap/evolution-book-config-ldap.c @@ -23,8 +23,8 @@ #include <libebackend/libebackend.h> #include <libevolution-utils/e-alert-dialog.h> +#include <misc/e-book-source-config.h> #include <misc/e-source-config-backend.h> -#include <addressbook/gui/widgets/e-book-source-config.h> #include "e-source-ldap.h" diff --git a/modules/book-config-local/evolution-book-config-local.c b/modules/book-config-local/evolution-book-config-local.c index 6cbcc27a0d..b6c31a7ed8 100644 --- a/modules/book-config-local/evolution-book-config-local.c +++ b/modules/book-config-local/evolution-book-config-local.c @@ -21,8 +21,8 @@ #include <libebackend/libebackend.h> +#include <misc/e-book-source-config.h> #include <misc/e-source-config-backend.h> -#include <addressbook/gui/widgets/e-book-source-config.h> typedef ESourceConfigBackend EBookConfigLocal; typedef ESourceConfigBackendClass EBookConfigLocalClass; diff --git a/modules/book-config-webdav/evolution-book-config-webdav.c b/modules/book-config-webdav/evolution-book-config-webdav.c index c352a3365f..78d86f5587 100644 --- a/modules/book-config-webdav/evolution-book-config-webdav.c +++ b/modules/book-config-webdav/evolution-book-config-webdav.c @@ -21,8 +21,8 @@ #include <libebackend/libebackend.h> +#include <misc/e-book-source-config.h> #include <misc/e-source-config-backend.h> -#include <addressbook/gui/widgets/e-book-source-config.h> typedef ESourceConfigBackend EBookConfigWebdav; typedef ESourceConfigBackendClass EBookConfigWebdavClass; diff --git a/modules/cal-config-contacts/evolution-cal-config-contacts.c b/modules/cal-config-contacts/evolution-cal-config-contacts.c index b310917170..daf2127808 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 <libebackend/libebackend.h> +#include <misc/e-book-source-config.h> #include <misc/e-source-config-backend.h> #include <calendar/gui/e-cal-source-config.h> -#include <addressbook/gui/widgets/e-book-source-config.h> #include "e-contacts-selector.h" #include "e-source-contacts.h" |