aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt McCutchen <matt@mattmccutchen.net>2010-04-07 16:21:08 +0800
committerMilan Crha <mcrha@redhat.com>2010-04-07 16:21:08 +0800
commit98bec02d2b93bef702d3463bdf36ab3388ea8596 (patch)
tree4d6d912fb12447ad2dd76ee68fbae0cc3d7a69d4
parentf278942da8173256a3f0269d4787a272457e21e0 (diff)
downloadgsoc2013-evolution-98bec02d2b93bef702d3463bdf36ab3388ea8596.tar.gz
gsoc2013-evolution-98bec02d2b93bef702d3463bdf36ab3388ea8596.tar.zst
gsoc2013-evolution-98bec02d2b93bef702d3463bdf36ab3388ea8596.zip
Bug #614647 - Don't reset names and colors of default mail labels
-rw-r--r--mail/e-mail-label-list-store.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index ed0d4cdd6b..6b317b6b5b 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -96,17 +96,15 @@ mail_label_list_store_ensure_defaults (EMailLabelListStore *store)
label_color = label_defaults[ii].label_color;
label_tag = label_defaults[ii].label_tag;
+ if (e_mail_label_list_store_lookup (store, label_tag, &iter))
+ continue;
+
encoded = mail_label_list_store_encode_label (
label_name, label_color, label_tag);
- if (e_mail_label_list_store_lookup (store, label_tag, &iter))
- gtk_list_store_set (
- GTK_LIST_STORE (store),
- &iter, 0, encoded, -1);
- else
- gtk_list_store_insert_with_values (
- GTK_LIST_STORE (store),
- NULL, -1, 0, encoded, -1);
+ gtk_list_store_insert_with_values (
+ GTK_LIST_STORE (store),
+ NULL, -1, 0, encoded, -1);
g_free (encoded);
}