aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-composer-prefs.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2002-10-16 12:07:31 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-10-16 12:07:31 +0800
commit03224d610f89068b30571d94dee3cae77c34f221 (patch)
tree16e73291533846ba3ca1fed2c52ccbb41023e901 /mail/mail-composer-prefs.c
parent151aa621b445174f006f30b6d095b7a03779a382 (diff)
downloadgsoc2013-evolution-03224d610f89068b30571d94dee3cae77c34f221.tar.gz
gsoc2013-evolution-03224d610f89068b30571d94dee3cae77c34f221.tar.zst
gsoc2013-evolution-03224d610f89068b30571d94dee3cae77c34f221.zip
Add the new-mail-notify rule to the filter driver before adding the user
2002-10-15 Jeffrey Stedfast <fejj@ximian.com> * mail-session.c (main_get_filter_driver): Add the new-mail-notify rule to the filter driver before adding the user defined filter rules so that we can be sure that the new-mail-notify rule gets invoked. Fixes bug #32328. * mail-composer-prefs.c (mail_composer_prefs_new_signature): Make sure that name[0] cannot ever be NULL. Should maybe fix bug #32230. svn path=/trunk/; revision=18374
Diffstat (limited to 'mail/mail-composer-prefs.c')
-rw-r--r--mail/mail-composer-prefs.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c
index f64e844f2c..1fc0afb05f 100644
--- a/mail/mail-composer-prefs.c
+++ b/mail/mail-composer-prefs.c
@@ -227,24 +227,27 @@ MailConfigSignature *
mail_composer_prefs_new_signature (MailComposerPrefs *prefs, gboolean html, const gchar *script)
{
MailConfigSignature *sig;
- char *name [1];
+ char *name[1];
int row;
sig = mail_config_signature_add (html, script);
if (prefs) {
- name [0] = e_utf8_to_gtk_string (GTK_WIDGET (prefs->sig_clist), sig->name);
+ if (!(name[0] = e_utf8_to_gtk_string (GTK_WIDGET (prefs->sig_clist), sig->name)))
+ name[0] = g_strdup ("");
+
if (sig->script) {
- gchar *tmp;
-
- tmp = name [0];
- name [0] = g_strconcat (name [0], _(" [script]"), NULL);
+ char *tmp;
+
+ tmp = name[0];
+ name[0] = g_strconcat (tmp, _(" [script]"), NULL);
g_free (tmp);
}
+
row = gtk_clist_append (prefs->sig_clist, name);
gtk_clist_set_row_data (prefs->sig_clist, row, sig);
gtk_clist_select_row (GTK_CLIST (prefs->sig_clist), row, 0);
- g_free (name [0]);
+ g_free (name[0]);
/*gtk_widget_grab_focus (prefs->sig_name);*/
}