diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-03 12:43:40 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-03 12:43:40 +0800 |
| commit | 086a96050b16f6dabd99a391b5a4faf0411963a1 (patch) | |
| tree | 73a4c2efb11f255ff1685114a051d731a6a12e13 /shell/e-shell-window-private.c | |
| parent | 791c982c456fca453978358d2e919082419b7808 (diff) | |
| download | gsoc2013-evolution-086a96050b16f6dabd99a391b5a4faf0411963a1.tar.gz gsoc2013-evolution-086a96050b16f6dabd99a391b5a4faf0411963a1.tar.zst gsoc2013-evolution-086a96050b16f6dabd99a391b5a4faf0411963a1.zip | |
Tasks progress. Merge EMemoPreview back into ECalComponentPreview.
svn path=/branches/kill-bonobo/; revision=36538
Diffstat (limited to 'shell/e-shell-window-private.c')
| -rw-r--r-- | shell/e-shell-window-private.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index 78fa425b26..c6283a1481 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.c @@ -109,7 +109,7 @@ shell_window_menu_item_select_cb (EShellWindow *shell_window, { GtkAction *action; GtkLabel *label; - gchar *tooltip; + gchar *tooltip = NULL; action = g_object_get_data (G_OBJECT (menu_item), "action"); g_return_if_fail (GTK_IS_ACTION (action)); @@ -410,6 +410,9 @@ e_shell_window_switch_to_view (EShellWindow *shell_window, EShellView *shell_view; gint page_num; + g_return_if_fail (E_IS_SHELL_WINDOW (shell_window)); + g_return_if_fail (view_name != NULL); + shell_view = e_shell_window_get_shell_view (shell_window, view_name); page_num = e_shell_view_get_page_num (shell_view); @@ -440,7 +443,9 @@ e_shell_window_update_icon (EShellWindow *shell_window) EShellView *shell_view; GtkAction *action; const gchar *view_name; - gchar *icon_name; + gchar *icon_name = NULL; + + g_return_if_fail (E_IS_SHELL_WINDOW (shell_window)); view_name = e_shell_window_get_active_view (shell_window); shell_view = e_shell_window_get_shell_view (shell_window, view_name); @@ -459,6 +464,8 @@ e_shell_window_update_title (EShellWindow *shell_window) const gchar *view_name; gchar *window_title; + g_return_if_fail (E_IS_SHELL_WINDOW (shell_window)); + view_name = e_shell_window_get_active_view (shell_window); shell_view = e_shell_window_get_shell_view (shell_window, view_name); view_title = e_shell_view_get_title (shell_view); @@ -476,6 +483,8 @@ e_shell_window_update_new_menu (EShellWindow *shell_window) GtkWidget *widget; const gchar *path; + g_return_if_fail (E_IS_SHELL_WINDOW (shell_window)); + /* Update the "File -> New" submenu. */ path = "/main-menu/file-menu/new-menu"; menu = e_shell_window_create_new_menu (shell_window); |