From 052e89dd423b5ba2f394f55c2fcc48102e7b9bc3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 6 Aug 2009 17:48:45 -0400 Subject: Seal up ESignature and add GObject properties. --- mail/em-account-editor.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'mail/em-account-editor.c') diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 6c55a659f8..6ba40772c2 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -787,11 +787,16 @@ emae_signature_added (ESignatureList *signatures, ESignature *sig, EMAccountEdit { GtkTreeModel *model; GtkTreeIter iter; + const gchar *name; + const gchar *uid; + + name = e_signature_get_name (sig); + uid = e_signature_get_uid (sig); model = gtk_combo_box_get_model (emae->priv->signatures_dropdown); gtk_list_store_append ((GtkListStore *)model, &iter); - gtk_list_store_set ((GtkListStore *)model, &iter, 0, sig->autogen?_("Autogenerated"):sig->name, 1, sig->uid, -1); + gtk_list_store_set ((GtkListStore *)model, &iter, 0, name, 1, uid, -1); gtk_combo_box_set_active (emae->priv->signatures_dropdown, gtk_tree_model_iter_n_children (model, NULL)-1); } @@ -808,10 +813,13 @@ emae_signature_get_iter (EMAccountEditor *emae, ESignature *sig, GtkTreeModel ** return FALSE; do { + const gchar *signature_uid; gchar *uid; + signature_uid = e_signature_get_uid (sig); + gtk_tree_model_get (model, iter, 1, &uid, -1); - if (uid && !strcmp (uid, sig->uid)) + if (uid && !strcmp (uid, signature_uid)) found = TRUE; g_free (uid); } while (!found && gtk_tree_model_iter_next (model, iter)); @@ -834,9 +842,12 @@ emae_signature_changed (ESignatureList *signatures, ESignature *sig, EMAccountEd { GtkTreeIter iter; GtkTreeModel *model; + const gchar *name; + + name = e_signature_get_name (sig); if (emae_signature_get_iter (emae, sig, &model, &iter)) - gtk_list_store_set ((GtkListStore *)model, &iter, 0, sig->autogen?_("Autogenerated"):sig->name, -1); + gtk_list_store_set ((GtkListStore *)model, &iter, 0, name, -1); } static void @@ -923,11 +934,16 @@ emae_setup_signatures (EMAccountEditor *emae, GladeXML *xml) it = e_list_get_iterator ((EList *) signatures); while (e_iterator_is_valid (it)) { ESignature *sig = (ESignature *)e_iterator_get (it); + const gchar *name; + const gchar *uid; + + name = e_signature_get_name (sig); + uid = e_signature_get_uid (sig); gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, sig->autogen?_("Autogenerated"):sig->name, 1, sig->uid, -1); + gtk_list_store_set (store, &iter, 0, name, 1, uid, -1); - if (current && !strcmp (current, sig->uid)) + if (current && !strcmp (current, uid)) active = i; e_iterator_next (it); -- cgit v1.2.3