diff options
author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-09 04:37:00 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-09 04:37:00 +0800 |
commit | 5350eebb5ef8c07e69110616ce1662e0e92bea16 (patch) | |
tree | d1d822ed1af3c92168b04780cfb6ac48a18b5996 /shell/e-shell-window.c | |
parent | 52d683e48cf1103a9806da95c72abce2db3ae1f4 (diff) | |
download | gsoc2013-evolution-5350eebb5ef8c07e69110616ce1662e0e92bea16.tar.gz gsoc2013-evolution-5350eebb5ef8c07e69110616ce1662e0e92bea16.tar.zst gsoc2013-evolution-5350eebb5ef8c07e69110616ce1662e0e92bea16.zip |
Progress update:
- Merge ETaskBar into EShellTaskbar.
- Remember the last view, and make --component work.
svn path=/branches/kill-bonobo/; revision=36278
Diffstat (limited to 'shell/e-shell-window.c')
-rw-r--r-- | shell/e-shell-window.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 8d2e3c1180..218f4f599d 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -79,7 +79,7 @@ shell_window_new_view (EShellWindow *shell_window, shell_view = g_object_new ( shell_view_type, "page-num", page_num, - "title", title, "window", shell_window, NULL); + "title", title, "shell-window", shell_window, NULL); name = e_shell_view_get_name (shell_view); loaded_views = shell_window->priv->loaded_views; @@ -88,15 +88,15 @@ shell_window_new_view (EShellWindow *shell_window, /* Add pages to the various shell window notebooks. */ notebook = GTK_NOTEBOOK (shell_window->priv->content_notebook); - widget = e_shell_view_get_content_widget (shell_view); + widget = GTK_WIDGET (e_shell_view_get_content (shell_view)); gtk_notebook_append_page (notebook, widget, NULL); notebook = GTK_NOTEBOOK (shell_window->priv->sidebar_notebook); - widget = e_shell_view_get_sidebar_widget (shell_view); + widget = GTK_WIDGET (e_shell_view_get_sidebar (shell_view)); gtk_notebook_append_page (notebook, widget, NULL); notebook = GTK_NOTEBOOK (shell_window->priv->status_notebook); - widget = e_shell_view_get_taskbar_widget (shell_view); + widget = GTK_WIDGET (e_shell_view_get_taskbar (shell_view)); gtk_notebook_append_page (notebook, widget, NULL); g_signal_connect_swapped ( @@ -242,8 +242,7 @@ shell_window_class_init (EShellWindowClass *class) NULL, NULL, NULL, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT)); + G_PARAM_READWRITE)); g_object_class_install_property ( object_class, |