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.

* 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.

svn path=/trunk/; revision=23596

14 files changed, 78 insertions, 30 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2e53c2db3c..6355319bf0 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,35 @@
+2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
+
+	* 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.
+
 2003-12-02  Rodney Dawes  <dobey@ximian.com>
 
 	* gui/component/Makefile.am: Version the schemas
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 7bd11f677e..371539562a 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -30,7 +30,6 @@
 #include "addressbook-config.h"
 
 #include "evolution-config-control.h"
-#include <shell/e-folder-list.h>
 
 #include <gal/e-table/e-table-memory-store.h>
 #include <gal/e-table/e-table-scrolled.h>
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
index 73c415c6c6..c4fe9d257d 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c
@@ -38,8 +38,6 @@
 #include <gal/e-text/e-entry.h>
 #include <gal/util/e-text-event-processor.h>
 
-#include "evolution-shell-client.h"
-
 #include "Evolution-Addressbook-SelectNames.h"
 
 #include "e-select-names-manager.h"
@@ -491,6 +489,7 @@ impl_SelectNames_activate_dialog (PortableServer_Servant servant,
 				  const CORBA_char *section_id,
 				  CORBA_Environment *ev)
 {
+#if 0				/* FIXME */
 	ESelectNamesBonobo *select_names;
 	ESelectNamesBonoboPrivate *priv;
 	EvolutionShellClient *shell_client;
@@ -510,6 +509,7 @@ impl_SelectNames_activate_dialog (PortableServer_Servant servant,
 	e_select_names_manager_activate_dialog (priv->manager, shell_client,
 						section_id);
 	g_object_unref (shell_client);
+#endif
 }
 
 
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c
index a3001efbd1..b7b91b42d0 100644
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ b/addressbook/gui/component/select-names/e-select-names-manager.c
@@ -23,7 +23,6 @@
 #include "e-select-names.h"
 #include "e-select-names-completion.h"
 #include "e-select-names-popup.h"
-#include "e-folder-list.h"
 #include <addressbook/util/eab-book-util.h>
 #include <addressbook/util/eab-destination.h>
 #include "addressbook/gui/component/addressbook.h"
@@ -394,6 +393,7 @@ open_book_cb (EBook *book, EBookStatus status, ESelectNamesManager *manager)
 static void
 load_completion_books (ESelectNamesManager *manager)
 {
+#if 0
 	EFolderListItem *folders = e_folder_list_parse_xml (manager->cached_folder_list);
 	EFolderListItem *f;
 
@@ -415,6 +415,7 @@ load_completion_books (ESelectNamesManager *manager)
 		g_object_unref (source);
 	}
 	e_folder_list_free_items (folders);
+#endif
 }
 
 static void
@@ -610,7 +611,6 @@ clear_widget (gpointer data, GObject *where_object_was)
 
 void
 e_select_names_manager_activate_dialog (ESelectNamesManager *manager,
-					EvolutionShellClient *shell_client,
 					const char *id)
 {
 	g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager));
@@ -627,7 +627,7 @@ e_select_names_manager_activate_dialog (ESelectNamesManager *manager,
 
 		GList *iter;
 
-		manager->names = E_SELECT_NAMES (e_select_names_new (shell_client));
+		manager->names = E_SELECT_NAMES (e_select_names_new ());
 
 		for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
 			ESelectNamesManagerSection *section = iter->data;
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.h b/addressbook/gui/component/select-names/e-select-names-manager.h
index b48f597cb3..f5fb4aa451 100644
--- a/addressbook/gui/component/select-names/e-select-names-manager.h
+++ b/addressbook/gui/component/select-names/e-select-names-manager.h
@@ -62,7 +62,6 @@ ESelectNamesModel   *e_select_names_manager_get_source             (ESelectNames
 GtkWidget           *e_select_names_manager_create_entry           (ESelectNamesManager *manager,
 							            const char *id);
 void                 e_select_names_manager_activate_dialog        (ESelectNamesManager *manager,
-								    EvolutionShellClient *shell_client,
 							            const char *id);
 /* Standard Gtk function */			      
 GType                e_select_names_manager_get_type               (void);
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index b533696cfa..488ed10f0a 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -35,8 +35,6 @@
 #include <addressbook/util/eab-book-util.h>
 #include <addressbook/gui/component/addressbook-component.h>
 #include <addressbook/gui/component/addressbook.h>
-#include <shell/evolution-shell-client.h>
-#include <shell/evolution-folder-selector-button.h>
 
 #include "e-select-names.h"
 #include "e-select-names-table-model.h"
@@ -336,9 +334,10 @@ e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int n
 GtkWidget *
 e_addressbook_create_folder_selector(char *name, char *string1, char *string2, int num1, int num2)
 {
-	return g_object_new (EVOLUTION_TYPE_FOLDER_SELECTOR_BUTTON, NULL);
+	return gtk_label_new ("FIXME");
 }
 
+#if 0				/* FIXME */
 static void
 folder_selected (EvolutionFolderSelectorButton *button, GNOME_Evolution_Folder *folder,
 		 ESelectNames *e_select_names)
@@ -348,6 +347,7 @@ folder_selected (EvolutionFolderSelectorButton *button, GNOME_Evolution_Folder *
 	e_config_listener_set_string (eab_get_config_database(),
 				      "/apps/evolution/addressbook/select_names/last_used_uri", folder->physicalUri);
 }
+#endif
 
 static void
 update_query (GtkWidget *widget, ESelectNames *e_select_names)
@@ -560,9 +560,11 @@ e_select_names_init (ESelectNames *e_select_names)
 				 G_CALLBACK(update_query), e_select_names);
 
 	button = glade_xml_get_widget (gui, "folder-selector");
+#if 0				/* FIXME */
 	if (button && EVOLUTION_IS_FOLDER_SELECTOR_BUTTON (button))
 		g_signal_connect(button, "selected",
 				 G_CALLBACK(folder_selected), e_select_names);
+#endif
 	gtk_widget_show (button);
 
 	g_signal_connect (e_table_scrolled_get_table (e_select_names->table), "double_click",
@@ -632,7 +634,7 @@ e_select_names_dispose (GObject *object)
 }
 
 GtkWidget*
-e_select_names_new (EvolutionShellClient *shell_client)
+e_select_names_new (void)
 {
 	ESelectNames *e_select_names;
 	const char *selector_types[] = { "contacts/*", NULL };
@@ -652,11 +654,14 @@ e_select_names_new (EvolutionShellClient *shell_client)
 #endif
 
 	button = glade_xml_get_widget (e_select_names->gui, "folder-selector");
+
+#if 0				/* FIXME */
 	evolution_folder_selector_button_construct (EVOLUTION_FOLDER_SELECTOR_BUTTON (button),
 						    shell_client,
 						    _("Find contact in"),
 						    contacts_uri,
 						    selector_types);
+#endif
 
 	addressbook_model_set_uri(e_select_names, e_select_names->model, contacts_uri);
 
diff --git a/addressbook/gui/component/select-names/e-select-names.h b/addressbook/gui/component/select-names/e-select-names.h
index e67f64b70b..3624e40073 100644
--- a/addressbook/gui/component/select-names/e-select-names.h
+++ b/addressbook/gui/component/select-names/e-select-names.h
@@ -27,7 +27,6 @@
 #include <gal/e-table/e-table.h>
 #include <gal/e-table/e-table-scrolled.h>
 
-#include "evolution-shell-client.h"
 #include "e-addressbook-model.h"
 
 #include "e-select-names-model.h"
@@ -85,9 +84,10 @@ struct _ESelectNamesClass
 };
 
 
-GtkWidget *e_select_names_new          (EvolutionShellClient *shell_client);
 GType      e_select_names_get_type     (void);
 
+GtkWidget *e_select_names_new          (void);
+
 void       e_select_names_add_section  (ESelectNames         *e_select_names,
 				       	const char           *name,
 				       	const char           *id,
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 4fe37e6f73..bd4ed78463 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -33,8 +33,6 @@
 
 #include <gnome.h>
 
-#include <shell/evolution-shell-client.h>
-
 #include "addressbook/gui/contact-editor/e-contact-editor.h"
 #include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
 
@@ -496,6 +494,7 @@ got_book_cb (EBook *book, EBookStatus status, gpointer closure)
 void
 eab_transfer_contacts (EBook *source, GList *contacts /* adopted */, gboolean delete_from_source, GtkWindow *parent_window)
 {
+#if 0
 	EBook *dest;
 	const char *allowed_types[] = { "contacts/*", NULL };
 	GNOME_Evolution_Folder *folder;
@@ -521,14 +520,10 @@ eab_transfer_contacts (EBook *source, GList *contacts /* adopted */, gboolean de
 			desc = _("Copy contacts to");
 	}
 
-#if 0                           /* EPFIXME */
 	evolution_shell_client_user_select_folder (global_shell_client,
 						   parent_window,
 						   desc, last_uri, allowed_types,
 						   &folder);
-#else
-	folder = NULL;
-#endif
 
 	if (!folder)
 		return;
@@ -554,6 +549,7 @@ eab_transfer_contacts (EBook *source, GList *contacts /* adopted */, gboolean de
 	e_book_async_load_uri (dest, folder->physicalUri, got_book_cb, process);
 
 	CORBA_free (folder);
+#endif
 }
 
 #include <Evolution-Composer.h>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 795d8e3301..5ef9afff34 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,24 @@
+2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
+
+	* 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.
+
 2003-12-02  Rodney Dawes  <dobey@ximian.com>
 
 	* gui/Makefile.am: Version the schemas
diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h
index 37c0e9675b..08d5b7c0e8 100644
--- a/calendar/gui/e-cal-list-view.h
+++ b/calendar/gui/e-cal-list-view.h
@@ -30,7 +30,6 @@
 
 #include "e-cal-view.h"
 #include "gnome-cal.h"
-#include "evolution-activity-client.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index e31f0946dd..652efc7399 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -32,7 +32,6 @@
 
 #include "e-cal-view.h"
 #include "gnome-cal.h"
-#include "evolution-activity-client.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -449,9 +448,6 @@ struct _EDayView
 	gchar *pm_string;
 	gint am_string_width;
 	gint pm_string_width;
-
-	/* The activity client used to show messages on the status bar. */
-	EvolutionActivityClient *activity;
 };
 
 struct _EDayViewClass
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 5819daa7d9..44f0a97c2c 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -47,8 +47,6 @@
 #include <libecal/e-cal.h>
 #include <e-util/e-time-utils.h>
 #include <e-util/e-dialog-widgets.h>
-#include <evolution-shell-client.h>
-#include <evolution-folder-selector-button.h>
 #include <camel/camel-mime-filter-tohtml.h>
 #include "dialogs/delete-error.h"
 #include "calendar-config.h"
@@ -156,6 +154,7 @@ start_default_server (EItipControl *itip, ECal *client, gboolean tasks)
 	else
 		return e_cal_open_default_calendar (client, FALSE);
 #endif
+	return FALSE;
 }
 
 #if 0				/* EPFIXME, rewrite this */
@@ -2079,6 +2078,7 @@ send_freebusy (EItipControl *itip)
 	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
 }
 
+#if 0				/* FIXME */
 static void
 button_selected_cb (EvolutionFolderSelectorButton *button, GNOME_Evolution_Folder *folder, gpointer data)
 {
@@ -2100,6 +2100,7 @@ button_selected_cb (EvolutionFolderSelectorButton *button, GNOME_Evolution_Folde
 
 	g_free (uri);
 }
+#endif
 
 static void
 url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data)
@@ -2181,7 +2182,9 @@ default_server_started_cb (ECal *client, ECalendarStatus status, gpointer data)
 		button = NULL;
 	}
 
+#if 0
 	g_signal_connect (button, "selected", G_CALLBACK (button_selected_cb), context->itip);
+#endif
 	
 	gtk_container_add (GTK_CONTAINER (context->eb), button);
 	gtk_widget_show (button);
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 404cec6622..838917244d 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -36,8 +36,6 @@
 
 #include <gal/widgets/e-cursors.h>
 
-#include <evolution-shell-client.h>
-
 #include "dialogs/cal-prefs-dialog.h"
 #include "calendar-commands.h"
 #include "calendar-config.h"
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 9b29767396..57079a62e9 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -538,9 +538,9 @@ impl_createControls (PortableServer_Servant servant,
 	*corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (sidebar_control), ev);
 	*corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (view_control), ev);
 
-	/* FIXME temporary for testing.  */
+	/* The tasks component doesn't use the status bar so just return an empty label.  */
 	{
-		GtkLabel *label = gtk_label_new ("Hey hey this is the tasks component");
+		GtkLabel *label = gtk_label_new ("");
 		BonoboControl *control;
 
 		gtk_widget_show (label);