From ac0442e31c68ce073e4156bbe47d63da8f7d2523 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Tue, 2 Dec 2003 02:17:34 +0000 Subject: 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 --- calendar/ChangeLog | 8 ++++++++ calendar/gui/calendar-component.c | 11 +++++++++++ calendar/gui/tasks-component.c | 11 +++++++++++ 3 files changed, 30 insertions(+) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index f6f5f58841..cc6dc2e756 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2003-12-01 Ettore Perazzoli + + * 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. + 2003-12-01 Rodney Dawes * gui/GNOME_Evolution_Calendar.server.in.in: diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 0968b9372f..53acafe853 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -509,6 +509,7 @@ static void impl_createControls (PortableServer_Servant servant, Bonobo_Control *corba_sidebar_control, Bonobo_Control *corba_view_control, + Bonobo_Control *corba_statusbar_control, CORBA_Environment *ev) { CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant)); @@ -576,6 +577,16 @@ impl_createControls (PortableServer_Servant servant, /* Return the controls */ *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. */ + { + GtkWidget *label = gtk_label_new ("Hey hey this is the calendar"); + BonoboControl *control; + + gtk_widget_show (label); + control = bonobo_control_new (label); + *corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (control), ev); + } } diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 0045c66848..9b29767396 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -473,6 +473,7 @@ static void impl_createControls (PortableServer_Servant servant, Bonobo_Control *corba_sidebar_control, Bonobo_Control *corba_view_control, + Bonobo_Control *corba_statusbar_control, CORBA_Environment *ev) { TasksComponent *component = TASKS_COMPONENT (bonobo_object_from_servant (servant)); @@ -536,6 +537,16 @@ impl_createControls (PortableServer_Servant servant, /* Return the controls */ *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. */ + { + GtkLabel *label = gtk_label_new ("Hey hey this is the tasks component"); + BonoboControl *control; + + gtk_widget_show (label); + control = bonobo_control_new (label); + *corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (control), ev); + } } static GNOME_Evolution_CreatableItemTypeList * -- cgit