aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-account-gui.c
diff options
context:
space:
mode:
authorRadek Doulik <rodo@ximian.com>2001-06-29 00:23:55 +0800
committerRadek Doulik <rodo@src.gnome.org>2001-06-29 00:23:55 +0800
commit311491b26baf67164d5486b13cf794c29d6000cf (patch)
tree2de6ed152ea1446ff801a731e854e715cdcc4533 /mail/mail-account-gui.c
parent3460368f5986462c91b18f1a7c9ffac67031f9cd (diff)
downloadgsoc2013-evolution-311491b26baf67164d5486b13cf794c29d6000cf.tar.gz
gsoc2013-evolution-311491b26baf67164d5486b13cf794c29d6000cf.tar.zst
gsoc2013-evolution-311491b26baf67164d5486b13cf794c29d6000cf.zip
simplified(refactored) signature handling + better support for html
signatures 2001-06-28 Radek Doulik <rodo@ximian.com> * mail-config.c: use new fields everywhere * mail-config.h: as below * Mail.idl: added html_signature and has_html_signature svn path=/trunk/; revision=10564
Diffstat (limited to 'mail/mail-account-gui.c')
-rw-r--r--mail/mail-account-gui.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index 5bc80570fc..93b1dc3d25 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -798,8 +798,11 @@ mail_account_gui_new (MailConfigAccount *account)
gui->full_name = GTK_ENTRY (glade_xml_get_widget (gui->xml, "identity_full_name"));
gui->email_address = GTK_ENTRY (glade_xml_get_widget (gui->xml, "identity_address"));
gui->organization = GTK_ENTRY (glade_xml_get_widget (gui->xml, "identity_organization"));
- gui->signature = GNOME_FILE_ENTRY (glade_xml_get_widget (gui->xml, "identity_signature"));
+ gui->signature = GNOME_FILE_ENTRY (glade_xml_get_widget (gui->xml, "fileentry_signature"));
+ gui->html_signature = GNOME_FILE_ENTRY (glade_xml_get_widget (gui->xml, "fileentry_html_signature"));
+ gui->has_html_signature = GTK_CHECK_BUTTON (glade_xml_get_widget (gui->xml, "check_html_signature"));
gnome_file_entry_set_default_path (gui->signature, g_get_home_dir ());
+ gnome_file_entry_set_default_path (gui->html_signature, g_get_home_dir ());
if (account->id) {
if (account->id->name)
e_utf8_gtk_entry_set_text (gui->full_name, account->id->name);
@@ -812,6 +815,12 @@ mail_account_gui_new (MailConfigAccount *account)
gtk_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry (gui->signature)),
account->id->signature);
}
+ if (account->id->html_signature) {
+ gnome_file_entry_set_default_path (gui->html_signature, account->id->html_signature);
+ gtk_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry (gui->html_signature)),
+ account->id->html_signature);
+ }
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gui->has_html_signature), account->id->has_html_signature);
}
/* Source */
@@ -1183,6 +1192,8 @@ mail_account_gui_save (MailAccountGui *gui)
account->id->address = e_utf8_gtk_entry_get_text (gui->email_address);
account->id->organization = e_utf8_gtk_entry_get_text (gui->organization);
account->id->signature = gnome_file_entry_get_full_path (gui->signature, TRUE);
+ account->id->html_signature = gnome_file_entry_get_full_path (gui->html_signature, TRUE);
+ account->id->has_html_signature = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gui->has_html_signature));
old_enabled = account->source && account->source->enabled;
service_destroy (account->source);