diff options
| author | Milan Crha <mcrha@redhat.com> | 2012-05-31 00:46:49 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-05-31 00:46:49 +0800 |
| commit | c88d3170304e1892b221d0581a3cd3c767de4281 (patch) | |
| tree | be7750049e7dca9b187bea5347556d2007ba5509 /modules/mail/e-mail-shell-view-actions.c | |
| parent | b9d8defa321ea315ca15e59c9df33845563d5042 (diff) | |
| download | gsoc2013-evolution-c88d3170304e1892b221d0581a3cd3c767de4281.tar.gz gsoc2013-evolution-c88d3170304e1892b221d0581a3cd3c767de4281.tar.zst gsoc2013-evolution-c88d3170304e1892b221d0581a3cd3c767de4281.zip | |
Adapt to vFolder changes from evolution-data-server
Diffstat (limited to 'modules/mail/e-mail-shell-view-actions.c')
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index 5487920c74..bcda07c7a1 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -1556,7 +1556,14 @@ static GtkToggleActionEntry mail_toggle_entries[] = { "<Control>t", N_("Threaded message list"), NULL, /* Handled by property bindings */ - FALSE } + FALSE }, + + { "mail-vfolder-unmatched-enable", + NULL, + N_("_Unmatched Folder Enabled"), + NULL, + N_("Toggles whether Unmatched search folder is enabled"), + NULL } }; static GtkRadioActionEntry mail_view_entries[] = { @@ -1759,9 +1766,6 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view) gtk_action_group_add_actions ( action_group, mail_entries, G_N_ELEMENTS (mail_entries), mail_shell_view); - e_action_group_add_popup_actions ( - action_group, mail_popup_entries, - G_N_ELEMENTS (mail_popup_entries)); gtk_action_group_add_toggle_actions ( action_group, mail_toggle_entries, G_N_ELEMENTS (mail_toggle_entries), mail_shell_view); @@ -1777,6 +1781,9 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view) action_group, mail_scope_entries, G_N_ELEMENTS (mail_scope_entries), MAIL_SCOPE_CURRENT_FOLDER, NULL, NULL); + e_action_group_add_popup_actions ( + action_group, mail_popup_entries, + G_N_ELEMENTS (mail_popup_entries)); /* Search Folder Actions */ action_group = ACTION_GROUP (SEARCH_FOLDERS); @@ -1811,6 +1818,11 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view) ACTION (MAIL_VIEW_VERTICAL), "current-value", G_SETTINGS_BIND_DEFAULT); + g_settings_bind ( + settings, "enable-unmatched", + ACTION (MAIL_VFOLDER_UNMATCHED_ENABLE), "active", + G_SETTINGS_BIND_DEFAULT); + g_object_unref (settings); /* Fine tuning. */ |