aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-09-11 02:44:55 +0800
committerMilan Crha <mcrha@redhat.com>2009-09-11 02:44:55 +0800
commitd24e00ab2f382b79c9404e10e9ddc0bad1dc5587 (patch)
tree9d6e50a85675ddb124e5dd3dc9de2a727dc95cce
parentcd230e5a214099cea4b1a118848364b4b2cb258d (diff)
downloadgsoc2013-evolution-d24e00ab2f382b79c9404e10e9ddc0bad1dc5587.tar.gz
gsoc2013-evolution-d24e00ab2f382b79c9404e10e9ddc0bad1dc5587.tar.zst
gsoc2013-evolution-d24e00ab2f382b79c9404e10e9ddc0bad1dc5587.zip
Bug #572960 - Ignore and drop invalid signatures on load
-rw-r--r--e-util/e-signature-list.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index 3fd4f8ab15..34b45be5ba 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -204,13 +204,16 @@ gconf_signatures_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry,
}
if (!found) {
+ resave = TRUE;
+
/* Must be a new signature */
signature = e_signature_new_from_xml (l->data);
- have_autogen |= e_signature_get_autogenerated (signature);
- resave = TRUE;
+ if (signature) {
+ have_autogen |= e_signature_get_autogenerated (signature);
- e_list_append (E_LIST (signature_list), signature);
- new_sigs = g_slist_prepend (new_sigs, signature);
+ e_list_append (E_LIST (signature_list), signature);
+ new_sigs = g_slist_prepend (new_sigs, signature);
+ }
}
g_free (uid);