aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/gui/component/e-book-shell-view-private.c25
-rw-r--r--addressbook/gui/component/e-book-shell-view-private.h2
-rw-r--r--addressbook/gui/component/e-book-shell-view.c28
3 files changed, 32 insertions, 23 deletions
diff --git a/addressbook/gui/component/e-book-shell-view-private.c b/addressbook/gui/component/e-book-shell-view-private.c
index e8dca482a3..4bea688437 100644
--- a/addressbook/gui/component/e-book-shell-view-private.c
+++ b/addressbook/gui/component/e-book-shell-view-private.c
@@ -284,16 +284,8 @@ void
e_book_shell_view_private_init (EBookShellView *book_shell_view)
{
EBookShellViewPrivate *priv = book_shell_view->priv;
- EShellContent *shell_content;
- EShellSidebar *shell_sidebar;
- EShellTaskbar *shell_taskbar;
- EShellView *shell_view;
GHashTable *uid_to_view;
GHashTable *uid_to_editor;
- GtkWidget *container;
- GtkWidget *widget;
-
- shell_view = E_SHELL_VIEW (book_shell_view);
uid_to_view = g_hash_table_new_full (
g_str_hash, g_str_equal,
@@ -311,6 +303,20 @@ e_book_shell_view_private_init (EBookShellView *book_shell_view)
priv->uid_to_editor = uid_to_editor;
e_book_get_addressbooks (&priv->source_list, NULL);
+}
+
+void
+e_book_shell_view_private_constructed (EBookShellView *book_shell_view)
+{
+ EBookShellViewPrivate *priv = book_shell_view->priv;
+ EShellContent *shell_content;
+ EShellSidebar *shell_sidebar;
+ EShellTaskbar *shell_taskbar;
+ EShellView *shell_view;
+ GtkWidget *container;
+ GtkWidget *widget;
+
+ shell_view = E_SHELL_VIEW (book_shell_view);
/* Construct view widgets. */
@@ -369,6 +375,9 @@ e_book_shell_view_private_init (EBookShellView *book_shell_view)
e_categories_register_change_listener (
G_CALLBACK (book_shell_view_categories_changed_cb),
book_shell_view);
+
+ e_book_shell_view_actions_init (book_shell_view);
+ e_book_shell_view_update_search_filter (book_shell_view);
}
void
diff --git a/addressbook/gui/component/e-book-shell-view-private.h b/addressbook/gui/component/e-book-shell-view-private.h
index 6c5a3f8963..ccd344567e 100644
--- a/addressbook/gui/component/e-book-shell-view-private.h
+++ b/addressbook/gui/component/e-book-shell-view-private.h
@@ -106,6 +106,8 @@ struct _EBookShellViewPrivate {
void e_book_shell_view_private_init
(EBookShellView *book_shell_view);
+void e_book_shell_view_private_constructed
+ (EBookShellView *book_shell_view);
void e_book_shell_view_private_dispose
(EBookShellView *book_shell_view);
void e_book_shell_view_private_finalize
diff --git a/addressbook/gui/component/e-book-shell-view.c b/addressbook/gui/component/e-book-shell-view.c
index 218a0e9929..4c06cc5fba 100644
--- a/addressbook/gui/component/e-book-shell-view.c
+++ b/addressbook/gui/component/e-book-shell-view.c
@@ -172,14 +172,24 @@ static void
book_shell_view_constructed (GObject *object)
{
EBookShellView *book_shell_view;
+ ESourceSelector *selector;
+ ESource *source;
book_shell_view = E_BOOK_SHELL_VIEW (object);
- e_book_shell_view_actions_init (book_shell_view);
- e_book_shell_view_update_search_filter (book_shell_view);
-
/* Chain up to parent's constructed() method. */
G_OBJECT_CLASS (parent_class)->constructed (object);
+
+ e_book_shell_view_private_constructed (book_shell_view);
+
+ selector = E_SOURCE_SELECTOR (book_shell_view->priv->selector);
+ source = book_shell_view_load_primary_source (book_shell_view);
+ if (source != NULL)
+ e_source_selector_set_primary_selection (selector, source);
+ g_signal_connect_swapped (
+ selector, "primary-selection-changed",
+ G_CALLBACK (book_shell_view_save_primary_source),
+ book_shell_view);
}
static void
@@ -221,9 +231,6 @@ book_shell_view_class_init (EBookShellViewClass *class,
static void
book_shell_view_init (EBookShellView *book_shell_view)
{
- ESourceSelector *selector;
- ESource *source;
-
book_shell_view->priv =
E_BOOK_SHELL_VIEW_GET_PRIVATE (book_shell_view);
@@ -233,15 +240,6 @@ book_shell_view_init (EBookShellView *book_shell_view)
book_shell_view->priv->source_list, "changed",
G_CALLBACK (book_shell_view_source_list_changed_cb),
book_shell_view);
-
- selector = E_SOURCE_SELECTOR (book_shell_view->priv->selector);
- source = book_shell_view_load_primary_source (book_shell_view);
- if (source != NULL)
- e_source_selector_set_primary_selection (selector, source);
- g_signal_connect_swapped (
- selector, "primary-selection-changed",
- G_CALLBACK (book_shell_view_save_primary_source),
- book_shell_view);
}
GType