Pass a label for the status bar control for now.

* gui/component/addressbook-component.c (impl_createControls):
Pass a label for the status bar control for now.

* gui/calendar-component.c (impl_createControls): Pass a label for
the status bar control for now.

* gui/tasks-component.c (impl_createControls): Pass a label for
the status bar control for now.

* mail-component.c (impl_createControls): Pass a label for the
status bar control for now.

* e-shell.c (struct _EShellPrivate): Remove member
activity_handler.
(setup_activity_interface): Remove.
(e_shell_init): Don't call.
(create_window): Don't attach the task bar to the activity
handler.

* e-shell-window.c (struct _ComponentView): New member
statusbar_widget.
(struct _EShellWindowPrivate): Remove member task_bar.
(init_view): Get the status bar control from createControls and
put it in the ComponentView struct.
(setup_task_bar): New.
(setup_statusbar_notebook): New.
(switch_view): Switch the statusbar notebook too.
(impl_dispose): Add missing GTK_OBJECT() cast.
(e_shell_window_peek_task_bar): Remove.

* Evolution-Component.idl (Component::createControls): New out arg
"statusbar_control"; this way components can provide their own
status bar.

* e-activity-handler.c, e-activity-handler.h: Turn into a plain
GObject; translate all the CORBA methods into plain C methods.

* Makefile.am: Move e-activity-handler to libeshell instead of it
being in the shell.

svn path=/trunk/; revision=23555

1 files changed, 0 insertions, 23 deletions

diff --git a/shell/e-shell.c b/shell/e-shell.c
index 3406dec228..a29461ef00 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -28,7 +28,6 @@
 
 #include "e-util/e-dialog-utils.h"
 
-#include "e-activity-handler.h"
 #include "e-setup.h"
 #include "e-shell-constants.h"
 #include "e-shell-offline-handler.h"
@@ -96,9 +95,6 @@ struct _EShellPrivate {
 	/* Settings Dialog */
 	GtkWidget *settings_dialog;
 
-	/* The handler for the ::Activity interface.  */
-	EActivityHandler *activity_handler;   /* <aggregate> */
-	
 	/* Whether the shell is succesfully initialized.  This is needed during
 	   the start-up sequence, to avoid CORBA calls to do make wrong things
 	   to happen while the shell is initializing.  */
@@ -144,18 +140,6 @@ get_config_start_offline (void)
 	return value;
 }
 
-/* Set up the ::Activity interface.  */
-static void
-setup_activity_interface (EShell *shell)
-{
-	EActivityHandler *activity_handler;
-
-	activity_handler = e_activity_handler_new ();
-
-	bonobo_object_add_interface (BONOBO_OBJECT (shell), BONOBO_OBJECT (activity_handler));
-	shell->priv->activity_handler = activity_handler;
-}
-
 
 /* Interactivity handling.  */
 
@@ -328,8 +312,6 @@ create_window (EShell *shell,
 	g_signal_connect (window, "delete_event", G_CALLBACK (window_delete_event_cb), shell);
 	g_object_weak_ref (G_OBJECT (window), window_weak_notify, shell);
 
-	e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (e_shell_window_peek_task_bar (window)));
-
 	shell->priv->windows = g_list_prepend (shell->priv->windows, window);
 
 	g_signal_emit (shell, signals[NEW_WINDOW_CREATED], 0, window);
@@ -391,9 +373,6 @@ impl_dispose (GObject *object)
 		priv->settings_dialog = NULL;
 	}
 
-	/* No unreffing for this as it is aggregate.  */
-	/* bonobo_object_unref (BONOBO_OBJECT (priv->activity_handler)); */
-
 	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
 }
 
@@ -478,8 +457,6 @@ e_shell_init (EShell *shell)
 	priv->user_creatable_items_handler = e_user_creatable_items_handler_new (priv->component_registry);
 
 	shell->priv = priv;
-
-	setup_activity_interface (shell);
 }