aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorParthasarathi Susarla <saps@src.gnome.org>2005-12-21 15:18:49 +0800
committerParthasarathi Susarla <saps@src.gnome.org>2005-12-21 15:18:49 +0800
commit57884e830b43bf7a4a1eb08ce59cb8dd06a0de60 (patch)
tree8924656fe29b0ca86450ed4c55c185d917f2770b /addressbook
parent8e71ebe0f4885419bb524fed4838a3277003a828 (diff)
downloadgsoc2013-evolution-57884e830b43bf7a4a1eb08ce59cb8dd06a0de60.tar
gsoc2013-evolution-57884e830b43bf7a4a1eb08ce59cb8dd06a0de60.tar.gz
gsoc2013-evolution-57884e830b43bf7a4a1eb08ce59cb8dd06a0de60.tar.bz2
gsoc2013-evolution-57884e830b43bf7a4a1eb08ce59cb8dd06a0de60.tar.lz
gsoc2013-evolution-57884e830b43bf7a4a1eb08ce59cb8dd06a0de60.tar.xz
gsoc2013-evolution-57884e830b43bf7a4a1eb08ce59cb8dd06a0de60.tar.zst
gsoc2013-evolution-57884e830b43bf7a4a1eb08ce59cb8dd06a0de60.zip
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
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/component/addressbook-component.c35
2 files changed, 25 insertions, 17 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index a16a6a3bef..5903fbafcc 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-21 Not Zed <NotZed@Ximian.com>
+
+ * gui/component/addressbook-component.c (impl_createView): changed
+ from createControls for new shell apis.
+
+ Committed on behalf of Notzed - partha
+
2005-12-17 Tor Lillqvist <tml@novell.com>
* gui/component/addressbook-migrate.c
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 2332795736..72eedac8aa 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -41,6 +41,10 @@
#include "misc/e-task-bar.h"
#include "misc/e-info-label.h"
+#include "shell/e-component-view.h"
+
+#include "shell/e-component-view.h"
+
#include <string.h>
#include <bonobo/bonobo-i18n.h>
#include <gtk/gtkimage.h>
@@ -183,30 +187,27 @@ view_destroyed_cb (gpointer data, GObject *where_the_object_was)
/* Evolution::Component CORBA methods. */
-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)
{
AddressbookComponent *addressbook_component = ADDRESSBOOK_COMPONENT (bonobo_object_from_servant (servant));
AddressbookComponentPrivate *priv = addressbook_component->priv;
AddressbookView *view = addressbook_view_new ();
- BonoboControl *sidebar_control;
- BonoboControl *view_control;
- BonoboControl *statusbar_control;
-
- sidebar_control = bonobo_control_new (addressbook_view_peek_sidebar (view));
- view_control = addressbook_view_peek_folder_view (view);
- statusbar_control = bonobo_control_new (addressbook_view_peek_statusbar (view));
g_object_weak_ref (G_OBJECT (view), view_destroyed_cb, addressbook_component);
priv->views = g_list_append (priv->views, view);
- *corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (sidebar_control), ev);
- *corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (view_control), ev);
- *corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (statusbar_control), ev);
+ EComponentView *component_view;
+
+ component_view = e_component_view_new_controls (parent, "contacts",
+ bonobo_control_new (addressbook_view_peek_sidebar (view)),
+ addressbook_view_peek_folder_view (view),
+ bonobo_control_new (addressbook_view_peek_statusbar (view)));
+
+ return BONOBO_OBJREF(component_view);
+
}
static GNOME_Evolution_CreatableItemTypeList *
@@ -438,7 +439,7 @@ addressbook_component_class_init (AddressbookComponentClass *class)
POA_GNOME_Evolution_Component__epv *epv = &class->epv;
GObjectClass *object_class = G_OBJECT_CLASS (class);
- epv->createControls = impl_createControls;
+ epv->createView = impl_createView;
epv->_get_userCreatableItems = impl__get_userCreatableItems;
epv->requestCreateItem = impl_requestCreateItem;
epv->upgradeFromVersion = impl_upgradeFromVersion;