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 <evolution-shell-client.h>. * gui/e-itip-control.c: Do not #include <e-folder-selector-button.h> nor <evolution-shell-client.h>. (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 <evolution-folder-selector-button.h>. (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 <evolution-shell-client.h>. * mail-config.c: Likewise. * mail-vfolder.h: Do not #include <evolution-storage.h> or <evolution-shell-component.h>. * mail.h: Do not #include <evolution-storage.h>. * mail-ops.h: Do not #include <evolution-storage.h>. (mail_scan_subfolders): Remove prototype. (mail_update_subfolders): Likewise. svn path=/trunk/; revision=23595
This commit is contained in:
@ -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 \
|
||||
|
||||
@ -37,8 +37,6 @@
|
||||
#include "mail-config.h"
|
||||
#include "mail-mt.h"
|
||||
|
||||
#include "shell/evolution-shell-client.h"
|
||||
|
||||
#include <bonobo-activation/bonobo-activation.h>
|
||||
#include <bonobo/bonobo-shlib-factory.h>
|
||||
|
||||
|
||||
@ -47,8 +47,6 @@
|
||||
#include <bonobo/bonobo-moniker-util.h>
|
||||
#include <bonobo/bonobo-exception.h>
|
||||
|
||||
#include <shell/evolution-shell-client.h>
|
||||
|
||||
#include <gal/util/e-util.h>
|
||||
#include <gal/widgets/e-gui-utils.h>
|
||||
#include <e-util/e-url.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,
|
||||
|
||||
@ -30,7 +30,6 @@
|
||||
|
||||
#include "Evolution.h"
|
||||
|
||||
#include "evolution-shell-component.h"
|
||||
#include "mail-component.h"
|
||||
#include "mail-vfolder.h"
|
||||
#include "mail-tools.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"
|
||||
|
||||
@ -23,7 +23,6 @@
|
||||
#include <gtkhtml/gtkhtml.h>
|
||||
#include <camel/camel.h>
|
||||
#include <composer/e-msg-composer.h>
|
||||
#include <shell/evolution-storage.h>
|
||||
#include "mail-config.h"
|
||||
#include "mail-session.h"
|
||||
#include "mail-types.h"
|
||||
|
||||
Reference in New Issue
Block a user