diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-09 10:53:40 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-09 10:53:40 +0800 |
| commit | 935897c9a256e0d260adc1dd0dc56b1a5c760cd9 (patch) | |
| tree | 5c9aab3145e9c8e60e8a2b18d6d7ef93e8bb1d8f /shell/e-shell-view.c | |
| parent | 5350eebb5ef8c07e69110616ce1662e0e92bea16 (diff) | |
| download | gsoc2013-evolution-935897c9a256e0d260adc1dd0dc56b1a5c760cd9.tar gsoc2013-evolution-935897c9a256e0d260adc1dd0dc56b1a5c760cd9.tar.gz gsoc2013-evolution-935897c9a256e0d260adc1dd0dc56b1a5c760cd9.tar.bz2 gsoc2013-evolution-935897c9a256e0d260adc1dd0dc56b1a5c760cd9.tar.lz gsoc2013-evolution-935897c9a256e0d260adc1dd0dc56b1a5c760cd9.tar.xz gsoc2013-evolution-935897c9a256e0d260adc1dd0dc56b1a5c760cd9.tar.zst gsoc2013-evolution-935897c9a256e0d260adc1dd0dc56b1a5c760cd9.zip | |
Fix some bugs in the way the shell widgets get initialized.
svn path=/branches/kill-bonobo/; revision=36279
Diffstat (limited to 'shell/e-shell-view.c')
| -rw-r--r-- | shell/e-shell-view.c | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index f069a33567..4b388e3c93 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -206,26 +206,6 @@ shell_view_finalize (GObject *object) static void shell_view_constructed (GObject *object) { - EShellView *shell_view; - GtkWidget *widget; - - shell_view = E_SHELL_VIEW (object); - - /* We do this AFTER instance initialization so the - * E_SHELL_VIEW_GET_CLASS() macro works properly. */ - - widget = e_shell_content_new (shell_view); - shell_view->priv->content = g_object_ref_sink (widget); - gtk_widget_show (widget); - - widget = e_shell_sidebar_new (shell_view); - shell_view->priv->sidebar = g_object_ref_sink (widget); - gtk_widget_show (widget); - - widget = e_shell_taskbar_new (shell_view); - shell_view->priv->taskbar = g_object_ref_sink (widget); - gtk_widget_show (widget); - /* XXX GObjectClass doesn't implement constructed(), so we will. * Then subclasses won't have to check the function pointer * before chaining up. @@ -306,7 +286,22 @@ shell_view_class_init (EShellViewClass *class) static void shell_view_init (EShellView *shell_view) { + GtkWidget *widget; + shell_view->priv = E_SHELL_VIEW_GET_PRIVATE (shell_view); + + widget = e_shell_content_new (shell_view); + shell_view->priv->content = g_object_ref_sink (widget); + gtk_widget_show (widget); + + widget = e_shell_sidebar_new (shell_view); + shell_view->priv->sidebar = g_object_ref_sink (widget); + gtk_widget_show (widget); + + widget = e_shell_taskbar_new (shell_view); + shell_view->priv->taskbar = g_object_ref_sink (widget); + gtk_widget_show (widget); + } GType |