diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-13 12:02:09 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-13 12:02:09 +0800 |
| commit | 7ee6ef65f1019389c172478a80b8f0aa73a1453e (patch) | |
| tree | e50bcb96372f1fbbe5b53fc64b8200932ef7659d /addressbook/gui/component | |
| parent | df6a8262a141e0bec824149e7f65568d2187c5c2 (diff) | |
| download | gsoc2013-evolution-7ee6ef65f1019389c172478a80b8f0aa73a1453e.tar.gz gsoc2013-evolution-7ee6ef65f1019389c172478a80b8f0aa73a1453e.tar.zst gsoc2013-evolution-7ee6ef65f1019389c172478a80b8f0aa73a1453e.zip | |
Allow EShellContent, EShellSidebar, and EShellTaskbar to be subclassed,
and begin doing so for Calendars, Memos and Tasks. Makes the code cleaner.
svn path=/branches/kill-bonobo/; revision=36317
Diffstat (limited to 'addressbook/gui/component')
4 files changed, 5 insertions, 7 deletions
diff --git a/addressbook/gui/component/e-book-shell-view-actions.c b/addressbook/gui/component/e-book-shell-view-actions.c index 515531af88..d12f15e1f4 100644 --- a/addressbook/gui/component/e-book-shell-view-actions.c +++ b/addressbook/gui/component/e-book-shell-view-actions.c @@ -728,7 +728,7 @@ e_book_shell_view_actions_init (EBookShellView *book_shell_view) } void -e_book_shell_view_update_actions (EBookShellView *book_shell_view, +e_book_shell_view_actions_update (EBookShellView *book_shell_view, EABView *view) { EShellView *shell_view; diff --git a/addressbook/gui/component/e-book-shell-view-private.c b/addressbook/gui/component/e-book-shell-view-private.c index 1ed66f8289..037ef035bf 100644 --- a/addressbook/gui/component/e-book-shell-view-private.c +++ b/addressbook/gui/component/e-book-shell-view-private.c @@ -190,7 +190,7 @@ book_shell_view_activate_selected_source (EBookShellView *book_shell_view) g_signal_connect_swapped ( uid_view, "command-state-change", - G_CALLBACK (e_book_shell_view_update_actions), + G_CALLBACK (e_book_shell_view_actions_update), book_shell_view); book = e_book_new (source, NULL); @@ -396,7 +396,6 @@ e_book_shell_view_private_dispose (EBookShellView *book_shell_view) DISPOSE (priv->contact_actions); DISPOSE (priv->notebook); - DISPOSE (priv->scrolled_window); DISPOSE (priv->selector); DISPOSE (priv->activity_handler); diff --git a/addressbook/gui/component/e-book-shell-view-private.h b/addressbook/gui/component/e-book-shell-view-private.h index 6fbff31c5d..ba805b0dc9 100644 --- a/addressbook/gui/component/e-book-shell-view-private.h +++ b/addressbook/gui/component/e-book-shell-view-private.h @@ -33,10 +33,10 @@ #include <shell/e-shell-content.h> #include <shell/e-shell-sidebar.h> +#include <shell/e-activity-handler.h> #include <eab-menu.h> #include <eab-gui-util.h> -#include <e-activity-handler.h> #include <e-addressbook-selector.h> #include <e-addressbook-view.h> #include <gal-view-collection.h> @@ -92,7 +92,6 @@ struct _EBookShellViewPrivate { /*** Other Stuff ***/ GtkWidget *notebook; - GtkWidget *scrolled_window; GtkWidget *selector; EActivityHandler *activity_handler; @@ -121,7 +120,7 @@ void e_book_shell_view_private_finalize void e_book_shell_view_actions_init (EBookShellView *book_shell_view); -void e_book_shell_view_update_actions +void e_book_shell_view_actions_update (EBookShellView *book_shell_view, EABView *view); EABView * e_book_shell_view_get_current_view diff --git a/addressbook/gui/component/e-book-shell-view.c b/addressbook/gui/component/e-book-shell-view.c index ce0c8f2b55..262c7da616 100644 --- a/addressbook/gui/component/e-book-shell-view.c +++ b/addressbook/gui/component/e-book-shell-view.c @@ -151,7 +151,7 @@ book_shell_view_source_list_changed_cb (EBookShellView *book_shell_view, #if 0 eab_view_setup_menus (view, bonobo_uic); #endif - e_book_shell_view_update_actions (book_shell_view, view); + e_book_shell_view_actions_update (book_shell_view, view); } } |