aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-account-gui.c9
-rw-r--r--mail/mail-composer-prefs.c19
3 files changed, 21 insertions, 14 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index e1c4765b04..bad929809b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,12 @@
2002-05-01 Jeffrey Stedfast <fejj@ximian.com>
+ * 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.
+
* folder-browser.c (on_right_click): Fix the filter_menu static
array to use the E_POPUP_MENU_CC macros since we plan on using
custom closures for this.
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index 756fbd2c67..669be6b39c 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -37,6 +37,7 @@
#include "mail-session.h"
#include "mail-send-recv.h"
#include "mail-signature-editor.h"
+#include "mail-composer-prefs.h"
#define d(x)
@@ -1322,39 +1323,35 @@ sig_set_and_write (MailAccountGui *gui)
static void
sig_new_text (GtkWidget *w, MailAccountGui *gui)
{
-#if 0
if (!gui->dialog)
return;
sig_switch_to_list (w, gui);
- gui->text_signature = mail_composer_prefs_new_signature (gui->dialog, FALSE);
+ gui->text_signature = mail_composer_prefs_new_signature (NULL, FALSE);
gui->text_random = FALSE;
gtk_option_menu_set_history (GTK_OPTION_MENU (gui->sig_option_text), sig_get_index (gui->text_signature));
sig_set_and_write (gui);
gtk_widget_set_sensitive (gui->sig_edit_text, TRUE);
-#endif
}
static void
sig_new_html (GtkWidget *w, MailAccountGui *gui)
{
-#if 0
if (!gui->dialog)
return;
sig_switch_to_list (w, gui);
- gui->html_signature = mail_accounts_dialog_new_signature (gui->dialog, TRUE);
+ gui->html_signature = mail_composer_prefs_new_signature (NULL, TRUE);
gui->html_random = FALSE;
gtk_option_menu_set_history (GTK_OPTION_MENU (gui->sig_option_html), sig_get_index (gui->html_signature));
sig_set_and_write (gui);
gtk_widget_set_sensitive (gui->sig_edit_html, TRUE);
-#endif
}
static void
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;
}