[evolution] Move EBookSourceConfig to /widgets/misc.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Move EBookSourceConfig to /widgets/misc.
- Date: Thu, 14 Jun 2012 17:40:55 +0000 (UTC)
commit 2a4a12c470586ae39a2ce5b81cd19749168c371f
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Jun 14 11:49:41 2012 -0400
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.
addressbook/gui/widgets/Makefile.am | 2 --
modules/addressbook/e-book-shell-backend.c | 2 +-
modules/addressbook/e-book-shell-view-private.h | 2 +-
.../evolution-book-config-google.c | 2 +-
.../book-config-ldap/evolution-book-config-ldap.c | 2 +-
.../evolution-book-config-local.c | 2 +-
.../evolution-book-config-webdav.c | 2 +-
.../evolution-cal-config-contacts.c | 2 +-
widgets/misc/Makefile.am | 2 ++
.../misc}/e-book-source-config.c | 0
.../misc}/e-book-source-config.h | 0
11 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index a580be0..19c9c4f 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -55,8 +55,6 @@ libeabwidgets_la_SOURCES = \
e-addressbook-selector.h \
e-addressbook-view.c \
e-addressbook-view.h \
- e-book-source-config.c \
- e-book-source-config.h \
gal-view-minicard.c \
gal-view-minicard.h \
gal-view-factory-minicard.c \
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index 8aa7070..b2da5b9 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 928e5e2..8338476 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 3d49be1..858991a 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 e174783..5dd0c9e 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 6cbcc27..b6c31a7 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 c352a33..78d86f5 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 b310917..daf2127 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"
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 6b81d16..fd6997f 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -24,6 +24,7 @@ widgetsinclude_HEADERS = \
e-attachment-view.h \
e-auth-combo-box.h \
e-autocomplete-selector.h \
+ e-book-source-config.h \
e-buffer-tagger.h \
e-calendar.h \
e-calendar-item.h \
@@ -114,6 +115,7 @@ libemiscwidgets_la_SOURCES = \
e-attachment-view.c \
e-auth-combo-box.c \
e-autocomplete-selector.c \
+ e-book-source-config.c \
e-buffer-tagger.c \
e-calendar.c \
e-calendar-item.c \
diff --git a/addressbook/gui/widgets/e-book-source-config.c b/widgets/misc/e-book-source-config.c
similarity index 100%
rename from addressbook/gui/widgets/e-book-source-config.c
rename to widgets/misc/e-book-source-config.c
diff --git a/addressbook/gui/widgets/e-book-source-config.h b/widgets/misc/e-book-source-config.h
similarity index 100%
rename from addressbook/gui/widgets/e-book-source-config.h
rename to widgets/misc/e-book-source-config.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]