From 7d18bf233dc8bfa4484fdd3d19e2c61efdbbf7cd Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 3 Dec 2003 15:37:56 +0000 Subject: Do not depend on e-folder-list. * gui/component/addressbook-config.c: Do not depend on e-folder-list. * gui/component/select-names/e-select-names.c: Remove dependency on evolution-folder-selector-button. (e_addressbook_create_folder_selector): Just return a FIXME label for now. (folder_selected): #if 0 out. (e_select_names_init): Do not connect. * gui/component/select-names/e-select-names-manager.c (e_select_names_manager_activate_dialog): Don't get a shell_client arg anymore. (load_completion_books): Stub out. * gui/component/select-names/e-select-names.c (e_select_names_new): Don't get an EvolutionShellClient anymore. Don't create the folder selector button for now. * gui/component/select-names/e-select-names.h: Remove dependency on evolution-shell-client. * gui/component/select-names/e-select-names-bonobo.c: Remove dependency on evolution-shell-client. (impl_SelectNames_activate_dialog): Stub out. * gui/widgets/eab-gui-util.c: Remove dependency on evolution-shell-client. (eab_transfer_contacts): Stub out. * importers/icalendar-importer.c: Do not #include shell stuff. * gui/main.c: Do not #include . * gui/e-itip-control.c: Do not #include nor . (start_default_server): Return FALSE. (default_server_started_cb): Do not connect the "selected" signal on the button since it's now NULL. (button_selected_cb): #if 0 out. * gui/e-cal-list-view.h: Do not #include "evolution-activity-client.h". * gui/tasks-component.c (impl_createControls): Give an empty label for the status bar. * gui/e-day-view.h: Remove all deps on evolution-activity-client. * e-msg-composer-hdrs.c: Do not #include . (e_msg_composer_hdrs_set_post_to): #if 0 out for now. (e_msg_composer_hdrs_get_post_to): Likewise. * mail-vfolder.c: Do not #include "evolution-shell-component.h". * Makefile.am (libevolution_mail_la_SOURCES): Don't compile mail-importer.[ch] for now. * mail-component-factory.c: Do not #include . * mail-config.c: Likewise. * mail-vfolder.h: Do not #include or . * mail.h: Do not #include . * mail-ops.h: Do not #include . (mail_scan_subfolders): Remove prototype. (mail_update_subfolders): Likewise. svn path=/trunk/; revision=23595 --- mail/Makefile.am | 2 -- mail/mail-component-factory.c | 2 -- mail/mail-config.c | 2 -- mail/mail-ops.h | 8 -------- mail/mail-vfolder.c | 1 - mail/mail-vfolder.h | 2 -- mail/mail.h | 1 - 7 files changed, 18 deletions(-) (limited to 'mail') diff --git a/mail/Makefile.am b/mail/Makefile.am index 9907ce2c68..c28c9b5148 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -137,8 +137,6 @@ libevolution_mail_la_SOURCES = \ mail-config-factory.h \ mail-folder-cache.c \ mail-folder-cache.h \ - mail-importer.c \ - mail-importer.h \ mail-mt.c \ mail-mt.h \ mail-offline-handler.c \ diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c index cd3416de85..d2130ef7ce 100644 --- a/mail/mail-component-factory.c +++ b/mail/mail-component-factory.c @@ -37,8 +37,6 @@ #include "mail-config.h" #include "mail-mt.h" -#include "shell/evolution-shell-client.h" - #include #include diff --git a/mail/mail-config.c b/mail/mail-config.c index 4e64adbe06..a034c743da 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -47,8 +47,6 @@ #include #include -#include - #include #include #include diff --git a/mail/mail-ops.h b/mail/mail-ops.h index 081e1a1425..142052277d 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -38,7 +38,6 @@ extern "C" { #include "message-list.h" -#include "evolution-storage.h" /*EvolutionStorage */ #include "e-util/e-msgport.h" #include "e-util/e-account.h" @@ -125,13 +124,6 @@ int mail_send_mail (const char *uri, CamelMimeMessage *message, void (*done) (char *uri, CamelMimeMessage *message, gboolean sent, void *data), void *data); -/* scan subfolders and add them to the storage, synchronous */ -/* FIXME: Move this to component-factory.c */ -void mail_scan_subfolders (CamelStore *store, EvolutionStorage *storage); -/* not sure about this one though */ -int mail_update_subfolders (CamelStore *store, EvolutionStorage *storage, - void (*done)(CamelStore *, void *data), - void *data); /* yeah so this is messy, but it does a lot, maybe i can consolidate all user_data's to be the one */ void mail_send_queue (CamelFolder *queue, const char *destination, diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 23b52789b4..84a278957a 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -30,7 +30,6 @@ #include "Evolution.h" -#include "evolution-shell-component.h" #include "mail-component.h" #include "mail-vfolder.h" #include "mail-tools.h" diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h index 50c0dc5d93..d945454c5e 100644 --- a/mail/mail-vfolder.h +++ b/mail/mail-vfolder.h @@ -3,8 +3,6 @@ #define _MAIL_VFOLDER_H #include "Evolution.h" -#include "evolution-storage.h" -#include "evolution-shell-component.h" #include "camel/camel-folder.h" #include "camel/camel-mime-message.h" diff --git a/mail/mail.h b/mail/mail.h index 16ad3e0136..52d1b720a5 100644 --- a/mail/mail.h +++ b/mail/mail.h @@ -23,7 +23,6 @@ #include #include #include -#include #include "mail-config.h" #include "mail-session.h" #include "mail-types.h" -- cgit v1.2.3