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

12 files changed, 37 insertions, 37 deletions

diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index 21e442e628..ae9a5c9b21 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -36,8 +36,6 @@
 #include <importer/evolution-importer.h>
 #include <importer/evolution-intelligent-importer.h>
 #include <importer/GNOME_Evolution_Importer.h>
-#include <shell/e-shell.h>
-#include <shell/evolution-shell-client.h>
 #include <libical/icalvcal.h>
 #include "evolution-calendar-importer.h"
 
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 5122c2c48a..0e617e735b 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
+
+	* 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.
+
 2003-12-01  Rodney Dawes  <dobey@ximian.com>
 
 	* e-msg-composer-hdrs.h: Use BASE_VERSION for repo_ids and OAFIIDs
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 01fc90b5f2..a0b0f55c81 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -48,7 +48,6 @@
 #include <gal/e-text/e-entry.h>
 
 #include <camel/camel.h>
-#include "evolution-folder-selector-button.h"
 #include "e-msg-composer-hdrs.h"
 #include "mail/mail-config.h"
 
@@ -1096,6 +1095,7 @@ e_msg_composer_hdrs_set_bcc (EMsgComposerHdrs *hdrs,
 	g_free (str);
 }
 
+#if 0
 void
 e_msg_composer_hdrs_set_post_to (EMsgComposerHdrs *hdrs,
 				 const char *post_to)
@@ -1105,6 +1105,7 @@ e_msg_composer_hdrs_set_post_to (EMsgComposerHdrs *hdrs,
 	
 	evolution_folder_selector_button_set_uri (EVOLUTION_FOLDER_SELECTOR_BUTTON (hdrs->priv->post_to.entry), post_to);
 }
+#endif
 
 void
 e_msg_composer_hdrs_set_subject (EMsgComposerHdrs *hdrs,
@@ -1257,6 +1258,7 @@ e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs)
 	return recip_destv;
 }
 
+#if 0
 char *
 e_msg_composer_hdrs_get_post_to (EMsgComposerHdrs *hdrs)
 {
@@ -1267,6 +1269,7 @@ e_msg_composer_hdrs_get_post_to (EMsgComposerHdrs *hdrs)
 	folder = evolution_folder_selector_button_get_folder (EVOLUTION_FOLDER_SELECTOR_BUTTON (hdrs->priv->post_to.entry));
 	return folder ? g_strdup (folder->physicalUri) : NULL;
 }
+#endif
 
 const char *
 e_msg_composer_hdrs_get_subject (EMsgComposerHdrs *hdrs)
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 <bonobo-activation/bonobo-activation.h>
 #include <bonobo/bonobo-shlib-factory.h>
 
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 <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>
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 <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"
diff --git a/shell/ChangeLog b/shell/ChangeLog
index dc01ccf000..fbc5e07848 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,29 @@
+2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
+
+	* e-folder-list.c: Remove.
+	* e-folder-list.h: Remove.
+
+	* e-folder-tree.c: Remove.
+	* e-folder-tree.h: Remove.
+
+	* e-folder.c: Remove.
+	* e-folder.h: Remove.
+
+	* evolution-shell-component.c: Remove.
+	* evolution-shell-component.h: Remove.
+
+	* evolution-shell-client.c: Remove.
+	* evolution-shell-client.h: Remove.
+
+	* evolution-folder-selector-button.c: Remove.
+	* evolution-folder-selector-button.h: Remove.
+
+	* evolution-activity-client.c: Remove.
+	* evolution-activity-client.h: Remove.
+
+	* evolution-storage.c: Remove.
+	* evolution-storage.h: Remove.
+
 2003-12-02  Ettore Perazzoli  <ettore@ximian.com>
 
 	* e-shell-window.c (e_shell_window_save_defaults): Implement.
diff --git a/shell/Makefile.am b/shell/Makefile.am
index c7935b6d5d..271e1ba829 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -110,42 +110,26 @@ eshellincludedir = $(privincludedir)/shell
 eshellinclude_HEADERS = 			\
 	Evolution.h				\
 	e-activity-handler.h			\
-	e-folder-list.h				\
-	e-folder-tree.h				\
-	e-folder.h				\
 	e-icon-factory.h			\
 	e-shell-corba-icon-utils.h		\
 	e-shell-utils.h				\
-	evolution-activity-client.h		\
 	evolution-config-control.h		\
-	evolution-folder-selector-button.h	\
 	evolution-session.h			\
-	evolution-shell-client.h		\
-	evolution-shell-component.h		\
 	evolution-shell-component-utils.h	\
 	evolution-shell-view.h			\
-	evolution-storage.h			\
 	evolution-wizard.h
 
 libeshell_la_SOURCES = 				\
 	$(IDL_GENERATED)			\
 	$(MARSHAL_GENERATED)			\
 	e-activity-handler.c			\
-	e-folder-list.c				\
-	e-folder-tree.c				\
-	e-folder.c				\
 	e-icon-factory.c			\
 	e-shell-corba-icon-utils.c		\
 	e-shell-utils.c				\
-	evolution-activity-client.c		\
 	evolution-config-control.c		\
-	evolution-folder-selector-button.c	\
 	evolution-session.c			\
-	evolution-shell-client.c		\
-	evolution-shell-component.c		\
 	evolution-shell-component-utils.c	\
 	evolution-shell-view.c			\
-	evolution-storage.c			\
 	evolution-wizard.c			\
 	$(eshellinclude_HEADERS)