From 17c6af5d3eba8b31a08dfaad77bcd8e5a5a47513 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 2 May 2002 00:16:56 +0000 Subject: Update the code to actually work. (sig_new_html): Same. 2002-05-01 Jeffrey Stedfast * mail-account-gui.c (sig_new_text): Update the code to actually work. (sig_new_html): Same. * mail-composer-prefs.c (mail_composer_prefs_new_signature): Allow 'prefs' to be NULL. svn path=/trunk/; revision=16659 --- mail/mail-composer-prefs.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'mail/mail-composer-prefs.c') diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c index 723ce5f651..08afa547dd 100644 --- a/mail/mail-composer-prefs.c +++ b/mail/mail-composer-prefs.c @@ -270,14 +270,17 @@ mail_composer_prefs_new_signature (MailComposerPrefs *prefs, gboolean html) sig = mail_config_signature_add (html); - name[0] = sig->name; - name[1] = sig->random ? _("yes") : _("no"); - row = gtk_clist_append (GTK_CLIST (prefs->sig_clist), name); - gtk_clist_set_row_data (GTK_CLIST (prefs->sig_clist), row, sig); - gtk_clist_select_row (GTK_CLIST (prefs->sig_clist), row, 0); - /*gtk_widget_grab_focus (prefs->sig_name);*/ - - sig_edit (NULL, prefs); + if (prefs) { + name[0] = sig->name; + name[1] = sig->random ? _("yes") : _("no"); + row = gtk_clist_append (GTK_CLIST (prefs->sig_clist), name); + gtk_clist_set_row_data (GTK_CLIST (prefs->sig_clist), row, sig); + gtk_clist_select_row (GTK_CLIST (prefs->sig_clist), row, 0); + /*gtk_widget_grab_focus (prefs->sig_name);*/ + } + + if (sig->filename && *sig->filename) + mail_signature_editor (sig); return sig; } -- cgit v1.2.3