From 57884e830b43bf7a4a1eb08ce59cb8dd06a0de60 Mon Sep 17 00:00:00 2001 From: Parthasarathi Susarla Date: Wed, 21 Dec 2005 07:18:49 +0000 Subject: committed these files to fix http://bugzilla.gnome.org/show_bug.cgi?id=260354 ChangeLog addressbook/ChangeLog addressbook/gui/component/addressbook-component.c calendar/ChangeLog calendar/gui/calendar-component.c calendar/gui/memos-component.c calendar/gui/tasks-component.c mail/ChangeLog mail/Evolution-Mail.idl mail/mail-component.c shell/ChangeLog shell/Evolution-Component.idl shell/Evolution-Shell.idl shell/Evolution.idl shell/Makefile.am shell/e-shell-window.c shell/e-shell-window.h shell/e-shell.c svn path=/trunk/; revision=30915 --- calendar/gui/calendar-component.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'calendar/gui/calendar-component.c') diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index b2cd808f94..1ed8641123 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -35,6 +35,7 @@ #include #include #include +#include #include "e-calendar-view.h" #include "calendar-config-keys.h" #include "calendar-config.h" @@ -1407,16 +1408,15 @@ view_destroyed_cb (gpointer data, GObject *where_the_object_was) } } -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) +static GNOME_Evolution_ComponentView +impl_createView (PortableServer_Servant servant, + GNOME_Evolution_ShellView parent, + CORBA_Environment *ev) { CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant)); CalendarComponentPrivate *priv; CalendarComponentView *component_view; + EComponentView *ecv; priv = calendar_component->priv; @@ -1426,16 +1426,17 @@ impl_createControls (PortableServer_Servant servant, /* FIXME Should we describe the problem in a control? */ bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed); - return; + return CORBA_OBJECT_NIL; } g_object_weak_ref (G_OBJECT (component_view->view_control), view_destroyed_cb, calendar_component); priv->views = g_list_append (priv->views, component_view); - /* Return the controls */ - *corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->sidebar_control), ev); - *corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->view_control), ev); - *corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->statusbar_control), ev); + /* TODO: Make CalendarComponentView just subclass EComponentView */ + ecv = e_component_view_new_controls (parent, "calendar", component_view->sidebar_control, + component_view->view_control, component_view->statusbar_control); + + return BONOBO_OBJREF(ecv); } @@ -1579,7 +1580,7 @@ calendar_component_class_init (CalendarComponentClass *class) parent_class = g_type_class_peek_parent (class); epv->upgradeFromVersion = impl_upgradeFromVersion; - epv->createControls = impl_createControls; + epv->createView = impl_createView; epv->_get_userCreatableItems = impl__get_userCreatableItems; epv->requestCreateItem = impl_requestCreateItem; epv->handleURI = impl_handleURI; -- cgit v1.2.3