diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-11-14 13:20:35 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-11-14 13:20:35 +0800 |
| commit | 51fe60cd69cd77fd63dbdd20b3e5fcc6bb650c8a (patch) | |
| tree | e0fe2c41338400f65cfdd2ad86c4f0da12b4877e /modules | |
| parent | e3768ee53411f6c0e933c670fe9c67c93d558e32 (diff) | |
| download | gsoc2013-evolution-51fe60cd69cd77fd63dbdd20b3e5fcc6bb650c8a.tar.gz gsoc2013-evolution-51fe60cd69cd77fd63dbdd20b3e5fcc6bb650c8a.tar.zst gsoc2013-evolution-51fe60cd69cd77fd63dbdd20b3e5fcc6bb650c8a.zip | |
Bug 600714 - No label colors in popup menu
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 15 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-private.h | 1 |
2 files changed, 9 insertions, 7 deletions
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index 07fdf8f366..3473d2a727 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -1729,7 +1729,7 @@ e_mail_shell_view_update_popup_labels (EMailShellView *mail_shell_view) valid = gtk_tree_model_get_iter_first (tree_model, &iter); while (valid) { - GtkToggleAction *toggle_action; + EMailLabelAction *label_action; GtkAction *action; gchar *action_name; gchar *stock_id; @@ -1745,25 +1745,26 @@ e_mail_shell_view_update_popup_labels (EMailShellView *mail_shell_view) action_name = g_strdup_printf ("mail-label-%d", ii); /* XXX Add a tooltip! */ - toggle_action = gtk_toggle_action_new ( + label_action = e_mail_label_action_new ( action_name, label, NULL, stock_id); g_object_set_data_full ( - G_OBJECT (toggle_action), "tag", + G_OBJECT (label_action), "tag", tag, (GDestroyNotify) g_free); /* Configure the action before we connect to signals. */ mail_shell_view_update_label_action ( - toggle_action, message_list, uids, tag); + GTK_TOGGLE_ACTION (label_action), + message_list, uids, tag); g_signal_connect ( - toggle_action, "toggled", + label_action, "toggled", G_CALLBACK (action_mail_label_cb), mail_shell_view); /* The action group takes ownership of the action. */ - action = GTK_ACTION (toggle_action); + action = GTK_ACTION (label_action); gtk_action_group_add_action (action_group, action); - g_object_unref (toggle_action); + g_object_unref (label_action); gtk_ui_manager_add_ui ( ui_manager, merge_id, path, action_name, diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h index bf86f33720..6142b6e9d8 100644 --- a/modules/mail/e-mail-shell-view-private.h +++ b/modules/mail/e-mail-shell-view-private.h @@ -40,6 +40,7 @@ #include "widgets/misc/e-popup-action.h" #include "widgets/menus/gal-view-instance.h" +#include "e-mail-label-action.h" #include "e-mail-label-dialog.h" #include "e-mail-label-list-store.h" #include "e-mail-local.h" |