diff options
Diffstat (limited to 'modules')
50 files changed, 185 insertions, 160 deletions
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am index b6dec30b0a..5757ac2e74 100644 --- a/modules/addressbook/Makefile.am +++ b/modules/addressbook/Makefile.am @@ -19,8 +19,9 @@ libevolution_module_addressbook_la_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DPREFIX=\""$(prefix)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(LDAP_CFLAGS) \ $(CHAMPLAIN_CFLAGS) @@ -72,8 +73,9 @@ libevolution_module_addressbook_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) \ $(LDAP_LIBS) diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c index f075372540..e3120246b3 100644 --- a/modules/addressbook/addressbook-config.c +++ b/modules/addressbook/addressbook-config.c @@ -76,7 +76,6 @@ #define EVOLUTIONPERSON "evolutionPerson" #define CALENTRY "calEntry" - typedef struct _AddressbookSourceDialog AddressbookSourceDialog; struct _AddressbookSourceDialog { @@ -122,8 +121,6 @@ struct _AddressbookSourceDialog { GtkWidget *display_name; }; - - #ifdef HAVE_LDAP static const gchar * diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am index 7803267836..5fbf45e5b4 100644 --- a/modules/bogofilter/Makefile.am +++ b/modules/bogofilter/Makefile.am @@ -5,8 +5,8 @@ libevolution_module_bogofilter_la_CPPFLAGS = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-bogofilter\" \ -DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libevolution_module_bogofilter_la_SOURCES = \ evolution-bogofilter.c @@ -14,8 +14,8 @@ libevolution_module_bogofilter_la_SOURCES = \ libevolution_module_bogofilter_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_bogofilter_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am index c725dedb1c..4f09f92692 100644 --- a/modules/calendar/Makefile.am +++ b/modules/calendar/Makefile.am @@ -7,9 +7,9 @@ libevolution_module_calendar_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - $(CAMEL_CFLAGS) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) + $(GTKHTML_CFLAGS) libevolution_module_calendar_la_SOURCES = \ evolution-module-calendar.c \ @@ -94,9 +94,9 @@ libevolution_module_calendar_la_LIBADD = \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/table/libetable.la \ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) libevolution_module_calendar_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/calendar/e-cal-config-calendar-item.c b/modules/calendar/e-cal-config-calendar-item.c index 09895c0a0e..d0d6e11b90 100644 --- a/modules/calendar/e-cal-config-calendar-item.c +++ b/modules/calendar/e-cal-config-calendar-item.c @@ -22,8 +22,9 @@ #include "e-cal-config-calendar-item.h" +#include <libebackend/e-extension.h> + #include <shell/e-shell.h> -#include <e-util/e-extension.h> #include <misc/e-calendar-item.h> static gpointer parent_class; diff --git a/modules/calendar/e-cal-config-comp-editor.c b/modules/calendar/e-cal-config-comp-editor.c index b522975bac..dc37c748c3 100644 --- a/modules/calendar/e-cal-config-comp-editor.c +++ b/modules/calendar/e-cal-config-comp-editor.c @@ -22,8 +22,9 @@ #include "e-cal-config-comp-editor.h" +#include <libebackend/e-extension.h> + #include <shell/e-shell.h> -#include <e-util/e-extension.h> #include <calendar/gui/dialogs/comp-editor.h> static gpointer parent_class; diff --git a/modules/calendar/e-cal-config-date-edit.c b/modules/calendar/e-cal-config-date-edit.c index d59549764b..48a5848f73 100644 --- a/modules/calendar/e-cal-config-date-edit.c +++ b/modules/calendar/e-cal-config-date-edit.c @@ -22,8 +22,9 @@ #include "e-cal-config-date-edit.h" +#include <libebackend/e-extension.h> + #include <shell/e-shell.h> -#include <e-util/e-extension.h> #include <misc/e-dateedit.h> static gpointer parent_class; diff --git a/modules/calendar/e-cal-config-meeting-store.c b/modules/calendar/e-cal-config-meeting-store.c index f9a91dacd0..7b4f2dec30 100644 --- a/modules/calendar/e-cal-config-meeting-store.c +++ b/modules/calendar/e-cal-config-meeting-store.c @@ -22,8 +22,9 @@ #include "e-cal-config-meeting-store.h" +#include <libebackend/e-extension.h> + #include <shell/e-shell.h> -#include <e-util/e-extension.h> #include <calendar/gui/e-meeting-store.h> static gpointer parent_class; diff --git a/modules/calendar/e-cal-config-meeting-time-selector.c b/modules/calendar/e-cal-config-meeting-time-selector.c index 23eef11ef5..249d541274 100644 --- a/modules/calendar/e-cal-config-meeting-time-selector.c +++ b/modules/calendar/e-cal-config-meeting-time-selector.c @@ -22,8 +22,9 @@ #include "e-cal-config-meeting-time-selector.h" +#include <libebackend/e-extension.h> + #include <shell/e-shell.h> -#include <e-util/e-extension.h> #include <calendar/gui/e-meeting-time-sel.h> static gpointer parent_class; diff --git a/modules/calendar/e-cal-config-model.c b/modules/calendar/e-cal-config-model.c index f42e4a9b66..9898942bf9 100644 --- a/modules/calendar/e-cal-config-model.c +++ b/modules/calendar/e-cal-config-model.c @@ -22,8 +22,9 @@ #include "e-cal-config-model.h" +#include <libebackend/e-extension.h> + #include <shell/e-shell.h> -#include <e-util/e-extension.h> #include <calendar/gui/e-cal-model.h> #include <calendar/gui/e-cal-model-tasks.h> diff --git a/modules/calendar/e-cal-config-view.c b/modules/calendar/e-cal-config-view.c index ecc35871ca..afe747dd80 100644 --- a/modules/calendar/e-cal-config-view.c +++ b/modules/calendar/e-cal-config-view.c @@ -22,8 +22,9 @@ #include "e-cal-config-view.h" +#include <libebackend/e-extension.h> + #include <shell/e-shell.h> -#include <e-util/e-extension.h> #include <calendar/gui/e-day-view.h> #include <calendar/gui/e-week-view.h> diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c index 21472453ef..aa5738e27e 100644 --- a/modules/calendar/e-cal-shell-view-actions.c +++ b/modules/calendar/e-cal-shell-view-actions.c @@ -1705,6 +1705,13 @@ static GtkRadioActionEntry calendar_filter_entries[] = { NULL, /* XXX Add a tooltip! */ CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS }, + { "calendar-filter-occurs-less-than-5-times", + NULL, + N_("Occurs Less Than 5 Times"), + NULL, + NULL, /* XXX Add a tooltip! */ + CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES }, + { "calendar-filter-unmatched", NULL, N_("Unmatched"), @@ -1972,7 +1979,7 @@ e_cal_shell_view_update_search_filter (ECalShellView *cal_shell_view) ii = CALENDAR_FILTER_UNMATCHED; e_action_combo_box_add_separator_after (combo_box, ii); - ii = CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS; + ii = CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES; e_action_combo_box_add_separator_after (combo_box, ii); e_shell_view_unblock_execute_search (shell_view); diff --git a/modules/calendar/e-cal-shell-view-actions.h b/modules/calendar/e-cal-shell-view-actions.h index b79bc6baaf..fcc77ea011 100644 --- a/modules/calendar/e-cal-shell-view-actions.h +++ b/modules/calendar/e-cal-shell-view-actions.h @@ -133,6 +133,8 @@ E_SHELL_WINDOW_ACTION ((window), "calendar-filter-any-category") #define E_SHELL_WINDOW_ACTION_CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS(window) \ E_SHELL_WINDOW_ACTION ((window), "calendar-filter-next-7-days-appointments") +#define E_SHELL_WINDOW_ACTION_CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES(window) \ + E_SHELL_WINDOW_ACTION ((window), "calendar-filter-occurs-less-than-5-times") #define E_SHELL_WINDOW_ACTION_CALENDAR_FILTER_UNMATCHED(window) \ E_SHELL_WINDOW_ACTION ((window), "calendar-filter-unmatched") #define E_SHELL_WINDOW_ACTION_CALENDAR_SEARCH_ADVANCED_HIDDEN(window) \ diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h index 7c78130fc3..6653632662 100644 --- a/modules/calendar/e-cal-shell-view-private.h +++ b/modules/calendar/e-cal-shell-view-private.h @@ -85,10 +85,11 @@ G_BEGIN_DECLS /* Filter items are displayed in ascending order. * Non-negative values are reserved for categories. */ enum { - CALENDAR_FILTER_ANY_CATEGORY = -4, - CALENDAR_FILTER_UNMATCHED = -3, - CALENDAR_FILTER_ACTIVE_APPOINTMENTS = -2, - CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS = -1 + CALENDAR_FILTER_ANY_CATEGORY = -5, + CALENDAR_FILTER_UNMATCHED = -4, + CALENDAR_FILTER_ACTIVE_APPOINTMENTS = -3, + CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS = -2, + CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES = -1 }; /* Search items are displayed in ascending order. */ diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c index 0a9b7701f8..f644402080 100644 --- a/modules/calendar/e-cal-shell-view.c +++ b/modules/calendar/e-cal-shell-view.c @@ -194,6 +194,12 @@ cal_shell_view_execute_search (EShellView *shell_view) range_search = TRUE; break; + case CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES: + temp = g_strdup_printf ("(and %s (< (occurrences-count?) 5))", query); + g_free (query); + query = temp; + break; + default: { GList *categories; diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am index 691fbe0bb1..2d4a774c70 100644 --- a/modules/composer-autosave/Makefile.am +++ b/modules/composer-autosave/Makefile.am @@ -5,8 +5,9 @@ libevolution_module_composer_autosave_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-composer-autosave\" \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ + $(GTKHTML_CFLAGS) libevolution_module_composer_autosave_la_SOURCES = \ evolution-composer-autosave.c \ @@ -20,8 +21,9 @@ libevolution_module_composer_autosave_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) libevolution_module_composer_autosave_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c index f2578875fa..f2b39c4d68 100644 --- a/modules/composer-autosave/e-composer-autosave.c +++ b/modules/composer-autosave/e-composer-autosave.c @@ -20,7 +20,8 @@ #include <config.h> #endif -#include <e-util/e-extension.h> +#include <libebackend/e-extension.h> + #include <e-util/e-alert-dialog.h> #include <composer/e-msg-composer.h> diff --git a/modules/composer-autosave/e-composer-registry.c b/modules/composer-autosave/e-composer-registry.c index eef69f1286..9fcba43ff9 100644 --- a/modules/composer-autosave/e-composer-registry.c +++ b/modules/composer-autosave/e-composer-registry.c @@ -21,9 +21,10 @@ #endif #include <glib/gstdio.h> +#include <libebackend/e-extension.h> + #include <shell/e-shell.h> #include <shell/e-shell-window.h> -#include <e-util/e-extension.h> #include <e-util/e-alert-dialog.h> #include <composer/e-msg-composer.h> diff --git a/modules/connman/Makefile.am b/modules/connman/Makefile.am index 58defdd838..d01a8f0daa 100644 --- a/modules/connman/Makefile.am +++ b/modules/connman/Makefile.am @@ -4,6 +4,7 @@ libevolution_module_connman_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-connman\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) libevolution_module_connman_la_SOURCES = \ @@ -12,6 +13,7 @@ libevolution_module_connman_la_SOURCES = \ libevolution_module_connman_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) libevolution_module_connman_la_LDFLAGS = \ diff --git a/modules/connman/evolution-connman.c b/modules/connman/evolution-connman.c index f6225df46c..2c35c2412e 100644 --- a/modules/connman/evolution-connman.c +++ b/modules/connman/evolution-connman.c @@ -21,9 +21,9 @@ #endif #include <gio/gio.h> +#include <libebackend/e-extension.h> #include <shell/e-shell.h> -#include <e-util/e-extension.h> #define CM_DBUS_SERVICE "net.connman" #define CM_DBUS_INTERFACE "net.connman.Manager" diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am index 0bea9ac1a2..90cf1aa54f 100644 --- a/modules/mail/Makefile.am +++ b/modules/mail/Makefile.am @@ -5,13 +5,13 @@ libevolution_module_mail_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/mail \ -I$(top_srcdir)/widgets \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(CAMEL_CFLAGS) \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ - -DG_LOG_DOMAIN=\"evolution-module-mail\" + -DG_LOG_DOMAIN=\"evolution-module-mail\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ + $(GTKHTML_CFLAGS) libevolution_module_mail_la_SOURCES = \ evolution-module-mail.c \ @@ -66,11 +66,9 @@ libevolution_module_mail_la_LIBADD = \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/capplet/settings/libevolution-mail-settings.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(CAMEL_LIBS) \ - $(GTKHTML_LIBS) \ - $(E_WIDGETS_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) libevolution_module_mail_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c index 23d448f7f0..83bc78f0b2 100644 --- a/modules/mail/e-mail-config-format-html.c +++ b/modules/mail/e-mail-config-format-html.c @@ -22,9 +22,10 @@ #include "e-mail-config-format-html.h" +#include <libebackend/e-extension.h> + #include <shell/e-shell.h> #include <e-util/e-util.h> -#include <e-util/e-extension.h> #include <mail/em-format-html.h> static gpointer parent_class; diff --git a/modules/mail/e-mail-config-reader.c b/modules/mail/e-mail-config-reader.c index 3837581562..b284fbdd8d 100644 --- a/modules/mail/e-mail-config-reader.c +++ b/modules/mail/e-mail-config-reader.c @@ -22,8 +22,9 @@ #include "e-mail-config-reader.h" +#include <libebackend/e-extension.h> + #include <shell/e-shell.h> -#include <e-util/e-extension.h> #include <mail/e-mail-reader.h> static gpointer parent_class; diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c index b8a755b46f..ebab286a2d 100644 --- a/modules/mail/e-mail-config-web-view.c +++ b/modules/mail/e-mail-config-web-view.c @@ -22,8 +22,9 @@ #include "e-mail-config-web-view.h" +#include <libebackend/e-extension.h> + #include <shell/e-shell.h> -#include <e-util/e-extension.h> #include <misc/e-web-view.h> typedef struct _EMailConfigWebView EMailConfigWebView; diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 5eb5ce9f53..ad572f1421 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -252,7 +252,8 @@ mail_shell_backend_mail_sync (EMailShellBackend *mail_shell_backend) session = e_mail_backend_get_session (backend); e_mail_store_foreach ( - session, (GFunc) mail_shell_backend_sync_store_cb, + E_MAIL_BACKEND (mail_shell_backend), + (GFunc) mail_shell_backend_sync_store_cb, mail_shell_backend); exit: @@ -455,10 +456,9 @@ mail_shell_backend_start (EShellBackend *shell_backend) shell_settings = e_shell_get_shell_settings (shell); backend = E_MAIL_BACKEND (shell_backend); - session = e_mail_backend_get_session (backend); data_dir = e_shell_backend_get_data_dir (shell_backend); - e_mail_store_init (session, data_dir); + e_mail_store_init (backend, data_dir); enable_search_folders = e_shell_settings_get_boolean ( shell_settings, "mail-enable-search-folders"); diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index f4f5ea26f6..6d9b3a4252 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -85,7 +85,6 @@ action_mail_account_disable_cb (GtkAction *action, EShellBackend *shell_backend; EShellView *shell_view; EMailBackend *backend; - EMailSession *session; EMFolderTree *folder_tree; CamelService *service; CamelStore *store; @@ -99,7 +98,6 @@ action_mail_account_disable_cb (GtkAction *action, shell_backend = e_shell_view_get_shell_backend (shell_view); backend = E_MAIL_BACKEND (shell_backend); - session = e_mail_backend_get_session (backend); folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar); store = em_folder_tree_get_selected_store (folder_tree); @@ -117,7 +115,7 @@ action_mail_account_disable_cb (GtkAction *action, account->enabled = !account->enabled; e_account_list_change (account_list, account); - e_mail_store_remove_by_account (session, account); + e_mail_store_remove_by_account (backend, account); if (account->parent_uid != NULL) e_account_list_remove (account_list, account); @@ -227,17 +225,15 @@ action_mail_download_cb (GtkAction *action, EMailView *mail_view; EMailReader *reader; EMailBackend *backend; - EMailSession *session; mail_shell_content = mail_shell_view->priv->mail_shell_content; mail_view = e_mail_shell_content_get_mail_view (mail_shell_content); reader = E_MAIL_READER (mail_view); backend = e_mail_reader_get_backend (reader); - session = e_mail_backend_get_session (backend); e_mail_store_foreach ( - session, (GFunc) action_mail_download_foreach_cb, reader); + backend, (GFunc) action_mail_download_foreach_cb, reader); } static void @@ -247,15 +243,12 @@ action_mail_flush_outbox_cb (GtkAction *action, EShellBackend *shell_backend; EShellView *shell_view; EMailBackend *backend; - EMailSession *session; shell_view = E_SHELL_VIEW (mail_shell_view); shell_backend = e_shell_view_get_shell_backend (shell_view); - backend = E_MAIL_BACKEND (shell_backend); - session = e_mail_backend_get_session (backend); - mail_send (session); + mail_send (backend); } static void @@ -1059,7 +1052,6 @@ action_mail_tools_subscriptions_cb (GtkAction *action, EShellWindow *shell_window; EShellView *shell_view; EMailBackend *backend; - EMailSession *session; EMFolderTree *folder_tree; GtkWidget *dialog; CamelStore *store; @@ -1073,11 +1065,9 @@ action_mail_tools_subscriptions_cb (GtkAction *action, store = em_folder_tree_get_selected_store (folder_tree); backend = E_MAIL_BACKEND (shell_backend); - session = e_mail_backend_get_session (backend); dialog = em_subscription_editor_new ( - GTK_WINDOW (shell_window), - CAMEL_SESSION (session), store); + GTK_WINDOW (shell_window), backend, store); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index a7309904bd..30a6756ddf 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -1089,7 +1089,6 @@ e_mail_shell_view_send_receive (EMailShellView *mail_shell_view, EMailSendReceiveMode mode, const gchar *account_uid) { - EMailSession *session; EShellView *shell_view; EShellWindow *shell_window; EShellBackend *shell_backend; @@ -1100,20 +1099,22 @@ e_mail_shell_view_send_receive (EMailShellView *mail_shell_view, shell_window = e_shell_view_get_shell_window (shell_view); shell_backend = e_shell_view_get_shell_backend (shell_view); - session = e_mail_backend_get_session (E_MAIL_BACKEND (shell_backend)); - em_utils_clear_get_password_canceled_accounts_flag (); if (!account_uid) { switch (mode) { case E_MAIL_SEND_RECEIVE_BOTH: - mail_send_receive (GTK_WINDOW (shell_window), session); + mail_send_receive ( + GTK_WINDOW (shell_window), + E_MAIL_BACKEND (shell_backend)); break; case E_MAIL_SEND_RECEIVE_RECEIVE: - mail_receive (GTK_WINDOW (shell_window), session); + mail_receive ( + GTK_WINDOW (shell_window), + E_MAIL_BACKEND (shell_backend)); break; case E_MAIL_SEND_RECEIVE_SEND: - mail_send (session); + mail_send (E_MAIL_BACKEND (shell_backend)); break; } } else { @@ -1124,7 +1125,8 @@ e_mail_shell_view_send_receive (EMailShellView *mail_shell_view, g_return_if_fail (account != NULL); if (account->enabled && account->source != NULL) - mail_receive_account (session, account); + mail_receive_account ( + E_MAIL_BACKEND (shell_backend), account); } } diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 3a92ce284b..5759b5830f 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -868,7 +868,7 @@ mail_shell_view_update_actions (EShellView *shell_view) shell_sidebar = e_shell_view_get_shell_sidebar (shell_view); state = e_shell_sidebar_check_state (shell_sidebar); - model = em_folder_tree_model_get_default (e_mail_reader_get_backend (reader)); + model = em_folder_tree_model_get_default (); folder_allows_children = (state & E_MAIL_SIDEBAR_FOLDER_ALLOWS_CHILDREN); diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c index 1b11b41b68..f4a0a740d5 100644 --- a/modules/mail/em-account-prefs.c +++ b/modules/mail/em-account-prefs.c @@ -62,7 +62,9 @@ G_DEFINE_TYPE ( E_TYPE_ACCOUNT_MANAGER) static gboolean -account_prefs_toggle_enable_special (EMAccountPrefs *prefs, EAccountTreeViewSelectedType type, gboolean enabled) +account_prefs_toggle_enable_special (EMAccountPrefs *prefs, + EAccountTreeViewSelectedType type, + gboolean enabled) { const gchar *prop = NULL; EShell *shell; @@ -106,8 +108,7 @@ account_prefs_enable_account_cb (EAccountTreeView *tree_view, g_return_if_fail (account != NULL); - session = e_mail_backend_get_session (prefs->priv->backend); - e_mail_store_add_by_account (session, account); + e_mail_store_add_by_account (prefs->priv->backend, account); } static void @@ -131,10 +132,8 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view, account_list = e_account_tree_view_get_account_list (tree_view); g_return_if_fail (account_list != NULL); - session = e_mail_backend_get_session (prefs->priv->backend); - if (!e_account_list_account_has_proxies (account_list, account)) { - e_mail_store_remove_by_account (session, account); + e_mail_store_remove_by_account (prefs->priv->backend, account); return; } @@ -151,7 +150,7 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view, e_account_list_remove_account_proxies (account_list, account); - e_mail_store_remove_by_account (session, account); + e_mail_store_remove_by_account (prefs->priv->backend, account); } static void @@ -330,7 +329,6 @@ account_prefs_delete_account (EAccountManager *manager) gint response; priv = EM_ACCOUNT_PREFS (manager)->priv; - session = e_mail_backend_get_session (priv->backend); account_list = e_account_manager_get_account_list (manager); tree_view = e_account_manager_get_tree_view (manager); @@ -359,7 +357,7 @@ account_prefs_delete_account (EAccountManager *manager) /* Remove the account from the folder tree. */ if (account->enabled) - e_mail_store_remove_by_account (session, account); + e_mail_store_remove_by_account (priv->backend, account); /* Remove all the proxies the account has created. */ if (has_proxies) @@ -423,7 +421,8 @@ em_account_prefs_init (EMAccountPrefs *prefs) } static void -account_tree_view_sort_order_changed_cb (EAccountTreeView *tree_view, EMailBackend *backend) +account_tree_view_sort_order_changed_cb (EAccountTreeView *tree_view, + EMailBackend *backend) { GSList *account_uids; diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index fb49352357..12a521b454 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -43,16 +43,16 @@ #include <gtkhtml/gtkhtml.h> #include <editor/gtkhtml-spell-language.h> -#include "e-util/e-util.h" -#include "e-util/e-util-private.h" -#include "mail/e-mail-junk-options.h" -#include "widgets/misc/e-charset-combo-box.h" -#include "widgets/misc/e-signature-editor.h" -#include "widgets/misc/e-signature-manager.h" -#include "widgets/misc/e-signature-preview.h" +#include <e-util/e-util.h> +#include <e-util/e-util-private.h> +#include <misc/e-charset-combo-box.h> +#include <misc/e-signature-editor.h> +#include <misc/e-signature-manager.h> +#include <misc/e-signature-preview.h> #include "em-config.h" #include "em-folder-selection-button.h" +#include "e-mail-junk-options.h" G_DEFINE_TYPE ( EMComposerPrefs, @@ -132,14 +132,17 @@ transform_new_to_old_reply_style (GBinding *binding, } static void -composer_prefs_finalize (GObject *object) +composer_prefs_dispose (GObject *object) { EMComposerPrefs *prefs = (EMComposerPrefs *) object; - g_object_unref (prefs->builder); + if (prefs->builder != NULL) { + g_object_unref (prefs->builder); + prefs->builder = NULL; + } - /* Chain up to parent's finalize() method. */ - G_OBJECT_CLASS (em_composer_prefs_parent_class)->finalize (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (em_composer_prefs_parent_class)->dispose (object); } static void @@ -148,7 +151,7 @@ em_composer_prefs_class_init (EMComposerPrefsClass *class) GObjectClass *object_class; object_class = G_OBJECT_CLASS (class); - object_class->finalize = composer_prefs_finalize; + object_class->dispose = composer_prefs_dispose; } static void @@ -538,7 +541,8 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, /* Signatures */ signature_list = e_get_signature_list (); - container = e_builder_get_widget (prefs->builder, "signature-alignment"); + container = e_builder_get_widget ( + prefs->builder, "signature-alignment"); widget = e_signature_manager_new (signature_list); gtk_container_add (GTK_CONTAINER (container), widget); gtk_widget_show (widget); @@ -589,9 +593,10 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, GtkWidget * em_composer_prefs_new (EPreferencesWindow *window) { + EShell *shell; EMComposerPrefs *prefs; - EShell *shell = e_preferences_window_get_shell (window); + shell = e_preferences_window_get_shell (window); g_return_val_if_fail (E_IS_SHELL (shell), NULL); prefs = g_object_new (EM_TYPE_COMPOSER_PREFS, NULL); diff --git a/modules/mail/em-composer-prefs.h b/modules/mail/em-composer-prefs.h index f39af57c4e..79a53bb775 100644 --- a/modules/mail/em-composer-prefs.h +++ b/modules/mail/em-composer-prefs.h @@ -76,8 +76,8 @@ struct _EMComposerPrefsClass { GtkVBoxClass parent_class; }; -GType em_composer_prefs_get_type (void); -GtkWidget *em_composer_prefs_new (EPreferencesWindow *window); +GType em_composer_prefs_get_type (void); +GtkWidget * em_composer_prefs_new (EPreferencesWindow *window); G_END_DECLS diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c index 242c84993e..64fe23e7f9 100644 --- a/modules/mail/em-network-prefs.c +++ b/modules/mail/em-network-prefs.c @@ -148,12 +148,11 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs, gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_http_port, sensitivity); gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_https_host, sensitivity); gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_https_port, sensitivity); -#if 0 gtk_widget_set_sensitive ((GtkWidget *) prefs->socks_host, sensitivity); gtk_widget_set_sensitive ((GtkWidget *) prefs->socks_port, sensitivity); gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_socks_host, sensitivity); gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_socks_port, sensitivity); -#endif + state = sensitivity && gtk_toggle_button_get_active (prefs->use_auth); gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_auth_user, state); gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_auth_pwd, state); @@ -389,13 +388,17 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) prefs->manual_proxy = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "rdoManualProxy")); prefs->http_host = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtHttpHost")); prefs->https_host = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtHttpsHost")); + prefs->socks_host = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtSocksHost")); prefs->ignore_hosts = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtIgnoreHosts")); prefs->http_port = GTK_SPIN_BUTTON (e_builder_get_widget (prefs->builder, "spnHttpPort")); prefs->https_port = GTK_SPIN_BUTTON (e_builder_get_widget (prefs->builder, "spnHttpsPort")); + prefs->socks_port = GTK_SPIN_BUTTON (e_builder_get_widget (prefs->builder, "spnSocksPort")); prefs->lbl_http_host = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblHttpHost")); prefs->lbl_http_port = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblHttpPort")); prefs->lbl_https_host = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblHttpsHost")); prefs->lbl_https_port = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblHttpsPort")); + prefs->lbl_socks_host = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblSocksHost")); + prefs->lbl_socks_port = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblSocksPort")); prefs->lbl_ignore_hosts = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblIgnoreHosts")); prefs->use_auth = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "chkUseAuth")); toggle_button_init (prefs, prefs->use_auth, GCONF_E_USE_AUTH_KEY); @@ -404,17 +407,6 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) prefs->auth_user = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtAuthUser")); prefs->auth_pwd = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtAuthPwd")); -#if 0 - prefs->socks_host = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtSocksHost")); - prefs->socks_port = GTK_SPIN_BUTTON (e_builder_get_widget (prefs->builder, "spnSocksPort")); - prefs->lbl_socks_host = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblSocksHost")); - prefs->lbl_socks_port = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblSocksPort")); - g_signal_connect (prefs->socks_host, "changed", - G_CALLBACK (widget_entry_changed_cb), GCONF_E_SOCKS_HOST_KEY); - g_signal_connect (prefs->socks_port, "value_changed", - G_CALLBACK (widget_entry_changed_cb), GCONF_E_SOCKS_PORT_KEY); -#endif - /* Manual proxy options */ g_signal_connect (prefs->http_host, "changed", G_CALLBACK (widget_entry_changed_cb), @@ -431,6 +423,12 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) g_signal_connect (prefs->https_port, "value_changed", G_CALLBACK (widget_entry_changed_cb), (gpointer) GCONF_E_HTTPS_PORT_KEY); + g_signal_connect (prefs->socks_host, "changed", + G_CALLBACK (widget_entry_changed_cb), + (gpointer) GCONF_E_SOCKS_HOST_KEY); + g_signal_connect (prefs->socks_port, "value_changed", + G_CALLBACK (widget_entry_changed_cb), + (gpointer) GCONF_E_SOCKS_PORT_KEY); g_signal_connect (prefs->auth_user, "changed", G_CALLBACK (widget_entry_changed_cb), (gpointer) GCONF_E_AUTH_USER_KEY); @@ -458,6 +456,10 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) gtk_entry_set_text (prefs->https_host, buf ? buf : ""); g_free (buf); + buf = gconf_client_get_string (prefs->gconf, GCONF_E_SOCKS_HOST_KEY, NULL); + gtk_entry_set_text (prefs->socks_host, buf ? buf : ""); + g_free (buf); + buf = NULL; ignore = gconf_client_get_list (prefs->gconf, GCONF_E_IGNORE_HOSTS_KEY, GCONF_VALUE_STRING, NULL); if (ignore) { @@ -502,14 +504,9 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) port = gconf_client_get_int (prefs->gconf, GCONF_E_HTTPS_PORT_KEY, NULL); gtk_spin_button_set_value (prefs->https_port, (gdouble) port); -#if 0 - buf = gconf_client_get_string (prefs->gconf, GCONF_E_SOCKS_HOST_KEY, NULL); - gtk_entry_set_text (prefs->socks_host, buf ? buf : ""); - g_free (buf); - port = gconf_client_get_int (prefs->gconf, GCONF_E_SOCKS_PORT_KEY, NULL); gtk_spin_button_set_value (prefs->socks_port, (gdouble) port); -#endif + emnp_set_markups (prefs); if (val == NETWORK_PROXY_DIRECT_CONNECTION || diff --git a/modules/mail/em-network-prefs.h b/modules/mail/em-network-prefs.h index 4196686ffe..f13a239490 100644 --- a/modules/mail/em-network-prefs.h +++ b/modules/mail/em-network-prefs.h @@ -82,12 +82,15 @@ struct _EMNetworkPrefs { GtkLabel *lbl_http_port; GtkLabel *lbl_https_host; GtkLabel *lbl_https_port; + GtkLabel *lbl_socks_host; + GtkLabel *lbl_socks_port; GtkLabel *lbl_ignore_hosts; GtkLabel *lbl_auth_user; GtkLabel *lbl_auth_pwd; GtkSpinButton *http_port; GtkSpinButton *https_port; + GtkSpinButton *socks_port; }; struct _EMNetworkPrefsClass { diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am index c6ab97f9fa..4e5598b498 100644 --- a/modules/mailto-handler/Makefile.am +++ b/modules/mailto-handler/Makefile.am @@ -4,8 +4,9 @@ libevolution_module_mailto_handler_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-mailto-handler\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(SHELL_CFLAGS) + $(GTKHTML_CFLAGS) libevolution_module_mailto_handler_la_SOURCES = \ evolution-mailto-handler.c @@ -13,8 +14,9 @@ libevolution_module_mailto_handler_la_SOURCES = \ libevolution_module_mailto_handler_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(SHELL_LIBS) + $(GTKHTML_LIBS) libevolution_module_mailto_handler_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c index fdc3841f38..4846aaaa85 100644 --- a/modules/mailto-handler/evolution-mailto-handler.c +++ b/modules/mailto-handler/evolution-mailto-handler.c @@ -21,9 +21,9 @@ #endif #include <glib/gi18n-lib.h> +#include <libebackend/e-extension.h> #include <shell/e-shell.h> -#include <e-util/e-extension.h> /* Standard GObject macros */ #define E_TYPE_MAILTO_HANDLER \ diff --git a/modules/network-manager/Makefile.am b/modules/network-manager/Makefile.am index bcfcaa7ecb..2d87b22acf 100644 --- a/modules/network-manager/Makefile.am +++ b/modules/network-manager/Makefile.am @@ -4,6 +4,7 @@ libevolution_module_network_manager_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-network-manager\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ $(SHELL_CFLAGS) \ $(NM_CFLAGS) @@ -14,8 +15,8 @@ libevolution_module_network_manager_la_SOURCES = \ libevolution_module_network_manager_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(GNOME_PLATFORM_LIBS) \ - $(SHELL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_network_manager_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/network-manager/evolution-network-manager.c b/modules/network-manager/evolution-network-manager.c index 3168b9adf1..bb83ba8104 100644 --- a/modules/network-manager/evolution-network-manager.c +++ b/modules/network-manager/evolution-network-manager.c @@ -21,6 +21,7 @@ #endif #include <gio/gio.h> +#include <libebackend/e-extension.h> #include <NetworkManager/NetworkManager.h> #if !defined(NM_CHECK_VERSION) @@ -28,7 +29,6 @@ #endif #include <shell/e-shell.h> -#include <e-util/e-extension.h> /* Standard GObject macros */ #define E_TYPE_NETWORK_MANAGER \ diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am index ed86fa7b0b..def90c1d06 100644 --- a/modules/offline-alert/Makefile.am +++ b/modules/offline-alert/Makefile.am @@ -5,8 +5,8 @@ libevolution_module_offline_alert_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-offline-alert\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(SHELL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libevolution_module_offline_alert_la_SOURCES = \ evolution-offline-alert.c @@ -14,8 +14,8 @@ libevolution_module_offline_alert_la_SOURCES = \ libevolution_module_offline_alert_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(GNOME_PLATFORM_LIBS) \ - $(SHELL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_offline_alert_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c index 4c064ce472..9fb5d2a60c 100644 --- a/modules/offline-alert/evolution-offline-alert.c +++ b/modules/offline-alert/evolution-offline-alert.c @@ -20,10 +20,11 @@ #include <config.h> #endif +#include <libebackend/e-extension.h> + #include <shell/e-shell-view.h> #include <shell/e-shell-window-actions.h> #include <e-util/e-alert-sink.h> -#include <e-util/e-extension.h> /* Standard GObject macros */ #define E_TYPE_OFFLINE_ALERT \ diff --git a/modules/online-accounts/Makefile.am b/modules/online-accounts/Makefile.am index a5dfd97a0b..ccb7ada29a 100644 --- a/modules/online-accounts/Makefile.am +++ b/modules/online-accounts/Makefile.am @@ -4,10 +4,8 @@ libevolution_module_online_accounts_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-online-accounts\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(GOA_CFLAGS) libevolution_module_online_accounts_la_SOURCES = \ @@ -20,10 +18,8 @@ libevolution_module_online_accounts_la_SOURCES = \ libevolution_module_online_accounts_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ $(GOA_LIBS) libevolution_module_online_accounts_la_LDFLAGS = \ diff --git a/modules/plugin-lib/Makefile.am b/modules/plugin-lib/Makefile.am index b958a9ab42..1f74550cb7 100644 --- a/modules/plugin-lib/Makefile.am +++ b/modules/plugin-lib/Makefile.am @@ -5,7 +5,7 @@ libevolution_module_plugin_lib_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-plugin-lib\" \ -I$(top_srcdir) \ -DEVOLUTION_PREFIX=\""$(prefix)"\" \ - $(E_UTIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) libevolution_module_plugin_lib_la_SOURCES = \ evolution-module-plugin-lib.c \ @@ -14,7 +14,7 @@ libevolution_module_plugin_lib_la_SOURCES = \ libevolution_module_plugin_lib_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(E_UTIL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) libevolution_module_plugin_lib_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am index 1e66fb4bd8..f350426b50 100644 --- a/modules/plugin-manager/Makefile.am +++ b/modules/plugin-manager/Makefile.am @@ -5,8 +5,8 @@ libevolution_module_plugin_manager_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-plugin-manager\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(SHELL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libevolution_module_plugin_manager_la_SOURCES = \ evolution-plugin-manager.c @@ -14,8 +14,8 @@ libevolution_module_plugin_manager_la_SOURCES = \ libevolution_module_plugin_manager_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(GNOME_PLATFORM_LIBS) \ - $(SHELL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_plugin_manager_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c index 29dba6c160..f95af37b23 100644 --- a/modules/plugin-manager/evolution-plugin-manager.c +++ b/modules/plugin-manager/evolution-plugin-manager.c @@ -20,13 +20,12 @@ #include <config.h> #endif -#include <glib/gi18n-lib.h> - #include <string.h> #include <stdio.h> +#include <glib/gi18n-lib.h> +#include <libebackend/e-extension.h> #include <e-util/e-plugin.h> -#include <e-util/e-extension.h> #include <shell/e-shell-window.h> #include <shell/e-shell-window-actions.h> diff --git a/modules/plugin-mono/Makefile.am b/modules/plugin-mono/Makefile.am index 8c9ba8ed81..a685cd89bd 100644 --- a/modules/plugin-mono/Makefile.am +++ b/modules/plugin-mono/Makefile.am @@ -4,7 +4,7 @@ libevolution_module_plugin_mono_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"evolution-plugin-mono\" \ -I$(top_srcdir) \ - $(E_UTIL_CFLAGS) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(MONO_CFLAGS) libevolution_module_plugin_mono_la_SOURCES = \ @@ -14,7 +14,7 @@ libevolution_module_plugin_mono_la_SOURCES = \ libevolution_module_plugin_mono_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(E_UTIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(MONO_LIBS) libevolution_module_plugin_mono_la_LDFLAGS = \ diff --git a/modules/plugin-python/Makefile.am b/modules/plugin-python/Makefile.am index 6bc2dcf91c..435ab31c0f 100644 --- a/modules/plugin-python/Makefile.am +++ b/modules/plugin-python/Makefile.am @@ -4,7 +4,7 @@ libevolution_module_plugin_python_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"evolution-plugin-python\" \ -I$(top_srcdir) \ - $(E_UTIL_CFLAGS) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(PY_INCLUDES) libevolution_module_plugin_python_la_SOURCES = \ @@ -15,7 +15,7 @@ libevolution_module_plugin_python_la_SOURCES = \ libevolution_module_plugin_python_la_LIBADD = \ -ldl -lutil -lm \ $(top_builddir)/e-util/libeutil.la \ - $(E_UTIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(PY_LIBS) libevolution_module_plugin_python_la_LDFLAGS = \ diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am index b21e876c90..8ea91303b4 100644 --- a/modules/spamassassin/Makefile.am +++ b/modules/spamassassin/Makefile.am @@ -4,8 +4,8 @@ libevolution_module_spamassassin_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-spamassassin\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libevolution_module_spamassassin_la_SOURCES = \ evolution-spamassassin.c @@ -14,8 +14,8 @@ libevolution_module_spamassassin_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ - $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_spamassassin_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am index 90ee736f5c..2643387010 100644 --- a/modules/startup-wizard/Makefile.am +++ b/modules/startup-wizard/Makefile.am @@ -5,9 +5,8 @@ libevolution_module_startup_wizard_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-startup-wizard\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libevolution_module_startup_wizard_la_SOURCES = \ evolution-startup-wizard.c @@ -20,9 +19,8 @@ libevolution_module_startup_wizard_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/capplet/settings/libevolution-mail-settings.la \ - $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_startup_wizard_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c index 75ef5d8d99..1184948dd7 100644 --- a/modules/startup-wizard/evolution-startup-wizard.c +++ b/modules/startup-wizard/evolution-startup-wizard.c @@ -21,11 +21,11 @@ #endif #include <glib/gi18n-lib.h> +#include <libebackend/e-extension.h> #include <shell/e-shell.h> #include <e-util/e-account-utils.h> #include <e-util/e-alert-dialog.h> -#include <e-util/e-extension.h> #include <e-util/e-import.h> #include <mail/e-mail-backend.h> diff --git a/modules/windows-sens/Makefile.am b/modules/windows-sens/Makefile.am index 5036642d09..a9b9d31865 100644 --- a/modules/windows-sens/Makefile.am +++ b/modules/windows-sens/Makefile.am @@ -1,20 +1,22 @@ module_LTLIBRARIES = libevolution-module-windows-sens.la -libevolution_module_windows_sens_la_CPPFLAGS = \ +libevolution_module_windows_sens_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-windows-sens\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) -libevolution_module_windows_sens_la_SOURCES = \ +libevolution_module_windows_sens_la_SOURCES = \ evolution-windows-sens.c libevolution_module_windows_sens_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(SENS_LIBS) -libevolution_module_windows_sens_la_LDFLAGS = \ +libevolution_module_windows_sens_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) -include $(top_srcdir)/git.mk diff --git a/modules/windows-sens/evolution-windows-sens.c b/modules/windows-sens/evolution-windows-sens.c index d2154590b1..f3110b2fcc 100644 --- a/modules/windows-sens/evolution-windows-sens.c +++ b/modules/windows-sens/evolution-windows-sens.c @@ -32,6 +32,8 @@ #include <eventsys.h> #else +#include <libebackend/e-extension.h> + /* Extract relevant typedefs from mingw-w64 headers */ typedef struct IEnumEventObject IEnumEventObject; @@ -195,7 +197,6 @@ struct ISensNetwork { #endif #include <shell/e-shell.h> -#include <e-util/e-extension.h> /* 4E14FB9F-2E22-11D1-9964-00C04FBBB345 */ DEFINE_GUID (IID_IEventSystem, 0x4E14FB9F, 0x2E22, 0x11D1, 0x99, 0x64, 0x00, 0xC0, 0x4F, 0xBB, 0xB3, 0x45); |