From b06cdfab92313ca7b1ce9a88ccb0ffba33cb17ab Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 19 Nov 2008 01:39:19 +0000 Subject: Progress update: - Tighter integration of GalViewInstance and EShellView. - EBinding. Stolen from ExoBinding. Lets you bind GObject properties together to automatically keep their values in sync. This is a godsend. Added to e-util, but might even deserve a place in libedataserver. - EShellSettings. This is the concept I blogged about. Already started ripping apart em-mailer-prefs.c. Others to follow. Any place where we're monitoring GConf keys is a target. - Incremental progress on the calender and mailer. Got EMFolderView somewhat working, but I think I'll be killing off EMFolderBrowser. svn path=/branches/kill-bonobo/; revision=36795 --- addressbook/gui/widgets/e-addressbook-view.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index f7c506ee78..216a7c77a6 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -364,19 +364,6 @@ addressbook_view_create_minicard_view (EAddressbookView *view) e_reflow_model_changed (E_REFLOW_MODEL (adapter)); } -static void -addressbook_view_changed_cb (EAddressbookView *view, - GalViewInstance *view_instance) -{ - EShellView *shell_view; - gchar *view_id; - - shell_view = e_addressbook_view_get_shell_view (view); - view_id = gal_view_instance_get_current_view_id (view_instance); - e_shell_view_set_view_id (shell_view, view_id); - g_free (view_id); -} - static void addressbook_view_display_view_cb (EAddressbookView *view, GalView *gal_view) @@ -608,24 +595,16 @@ static void addressbook_view_constructed (GObject *object) { EAddressbookView *view = E_ADDRESSBOOK_VIEW (object); - EShellView *shell_view; - EShellViewClass *shell_view_class; - GalViewCollection *view_collection; GalViewInstance *view_instance; + EShellView *shell_view; ESource *source; gchar *uri; shell_view = e_addressbook_view_get_shell_view (view); - shell_view_class = E_SHELL_VIEW_GET_CLASS (shell_view); - view_collection = shell_view_class->view_collection; - source = e_addressbook_view_get_source (view); uri = e_source_get_uri (source); - view_instance = gal_view_instance_new (view_collection, uri); - g_signal_connect_swapped ( - view_instance, "changed", - G_CALLBACK (addressbook_view_changed_cb), view); + view_instance = e_shell_view_new_view_instance (shell_view, uri); g_signal_connect_swapped ( view_instance, "display-view", G_CALLBACK (addressbook_view_display_view_cb), view); -- cgit v1.2.3