diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-01-05 21:40:19 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2010-01-05 21:40:19 +0800 |
| commit | ac07595af4ebae379eb8df46366d47f808e0a305 (patch) | |
| tree | cdbd71c928dfee07be4b814ed09cf4fe717c3d05 | |
| parent | 5c80f1534b435ff5c1c9cc88eb9f5c5c1124f82a (diff) | |
| download | gsoc2013-evolution-ac07595af4ebae379eb8df46366d47f808e0a305.tar gsoc2013-evolution-ac07595af4ebae379eb8df46366d47f808e0a305.tar.gz gsoc2013-evolution-ac07595af4ebae379eb8df46366d47f808e0a305.tar.bz2 gsoc2013-evolution-ac07595af4ebae379eb8df46366d47f808e0a305.tar.lz gsoc2013-evolution-ac07595af4ebae379eb8df46366d47f808e0a305.tar.xz gsoc2013-evolution-ac07595af4ebae379eb8df46366d47f808e0a305.tar.zst gsoc2013-evolution-ac07595af4ebae379eb8df46366d47f808e0a305.zip | |
Bug #597816 - Read/save search folders with labels properly
| -rw-r--r-- | modules/mail/e-mail-shell-backend.c | 8 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view.c | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index ef25000efc..0f1680d0a7 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -759,6 +759,14 @@ e_mail_labels_get_filter_options (void) name = e_mail_label_list_store_get_name (list_store, &iter); tag = e_mail_label_list_store_get_tag (list_store, &iter); + if (g_str_has_prefix (tag, "$Label")) { + gchar *tmp = tag; + + tag = g_strdup (tag + 6); + + g_free (tmp); + } + option = g_new0 (struct _filter_option, 1); option->title = e_str_without_underscores (name); option->value = tag; /* takes ownership */ diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index f216750005..65965185c4 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -112,6 +112,7 @@ mail_shell_view_execute_search (EShellView *shell_view) gchar *query; gchar *temp; gchar *tag; + const gchar *use_tag; gint value; priv = E_MAIL_SHELL_VIEW_GET_PRIVATE (shell_view); @@ -247,12 +248,15 @@ filter: tag = e_mail_label_list_store_get_tag ( E_MAIL_LABEL_LIST_STORE (model), &tree_iter); + use_tag = tag; + if (g_str_has_prefix (use_tag, "$Label")) + use_tag += 6; g_string_append_printf ( string, " (match-all (not (or " "(= (user-tag \"label\") \"%s\") " "(user-flag \"$Label%s\") " "(user-flag \"%s\"))))", - tag, tag, tag); + use_tag, use_tag, use_tag); g_free (tag); valid = gtk_tree_model_iter_next ( @@ -339,12 +343,15 @@ filter: tag = e_mail_label_list_store_get_tag ( E_MAIL_LABEL_LIST_STORE (model), &tree_iter); + use_tag = tag; + if (g_str_has_prefix (use_tag, "$Label")) + use_tag += 6; temp = g_strdup_printf ( "(and %s (match-all (or " "(= (user-tag \"label\") \"%s\") " "(user-flag \"$Label%s\") " "(user-flag \"%s\"))))", - query, tag, tag, tag); + query, use_tag, use_tag, use_tag); g_free (tag); g_free (query); |