diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-25 11:28:18 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-25 11:28:18 +0800 |
| commit | 32ffc3ca1ca80b2d843fbe28da7deab35fabcbf1 (patch) | |
| tree | 36f52060c250aacf445013b1bf15541892098f3f /mail/e-mail-shell-view-private.c | |
| parent | cbb3a71adc5551f4c600cfc6f53fc112f3022a78 (diff) | |
| download | gsoc2013-evolution-32ffc3ca1ca80b2d843fbe28da7deab35fabcbf1.tar gsoc2013-evolution-32ffc3ca1ca80b2d843fbe28da7deab35fabcbf1.tar.gz gsoc2013-evolution-32ffc3ca1ca80b2d843fbe28da7deab35fabcbf1.tar.bz2 gsoc2013-evolution-32ffc3ca1ca80b2d843fbe28da7deab35fabcbf1.tar.lz gsoc2013-evolution-32ffc3ca1ca80b2d843fbe28da7deab35fabcbf1.tar.xz gsoc2013-evolution-32ffc3ca1ca80b2d843fbe28da7deab35fabcbf1.tar.zst gsoc2013-evolution-32ffc3ca1ca80b2d843fbe28da7deab35fabcbf1.zip | |
Make the sidebar icon follow the folder icon.
Fix more runtime warnings.
svn path=/branches/kill-bonobo/; revision=37130
Diffstat (limited to 'mail/e-mail-shell-view-private.c')
| -rw-r--r-- | mail/e-mail-shell-view-private.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mail/e-mail-shell-view-private.c b/mail/e-mail-shell-view-private.c index 82a97352d9..160e1b8828 100644 --- a/mail/e-mail-shell-view-private.c +++ b/mail/e-mail-shell-view-private.c @@ -271,6 +271,8 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view) guint32 num_unread; guint32 num_visible; + /* FIXME The sidebar should handle icon name and primary text. */ + g_return_if_fail (E_IS_MAIL_SHELL_VIEW (mail_shell_view)); shell_view = E_SHELL_VIEW (mail_shell_view); @@ -290,11 +292,12 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view) gchar *label; action = e_shell_view_get_action (shell_view); + g_object_get (action, "label", &label, NULL); - e_shell_sidebar_set_primary_text (shell_sidebar, label); e_shell_sidebar_set_secondary_text (shell_sidebar, NULL); e_shell_view_set_title (shell_view, label); g_free (label); + return; } @@ -390,7 +393,6 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view) display_name = folder_name; title = g_strdup_printf ("%s (%s)", display_name, buffer->str); - e_shell_sidebar_set_primary_text (shell_sidebar, display_name); e_shell_sidebar_set_secondary_text (shell_sidebar, buffer->str); e_shell_view_set_title (shell_view, title); g_free (title); |