aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog1
-rw-r--r--mail/mail-composer-prefs.c7
-rw-r--r--mail/mail-composer-prefs.h1
3 files changed, 8 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d32be58325..7c3ea3525b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -10,6 +10,7 @@
2002-05-23 Radek Doulik <rodo@ximian.com>
* mail-composer-prefs.c: be more careful about language_str{_orig}
+ (mail_composer_prefs_construct): add auto smiley check button
2002-05-21 Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c
index 29f0802b42..300772b65e 100644
--- a/mail/mail-composer-prefs.c
+++ b/mail/mail-composer-prefs.c
@@ -745,7 +745,8 @@ mail_composer_prefs_construct (MailComposerPrefs *prefs)
GtkWidget *toplevel, *widget, *menu;
GladeXML *gui;
int style;
- char *names[][2] = {{"live_spell_check", "chkEnableSpellChecking"},
+ char *names[][4] = {{"live_spell_check", "chkEnableSpellChecking"},
+ {"magic_smileys_check", "chkAutoSmileys"},
{"gtk_html_prop_keymap_option", "omenuShortcutsType"},
{NULL, NULL}};
@@ -771,6 +772,10 @@ mail_composer_prefs_construct (MailComposerPrefs *prefs)
gtk_signal_connect (GTK_OBJECT (prefs->send_html), "toggled",
toggle_button_toggled, prefs);
+ prefs->auto_smileys = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkAutoSmileys"));
+ gtk_signal_connect (GTK_OBJECT (prefs->auto_smileys), "toggled",
+ toggle_button_toggled, prefs);
+
prefs->prompt_empty_subject = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkPromptEmptySubject"));
gtk_toggle_button_set_active (prefs->prompt_empty_subject, mail_config_get_prompt_empty_subject ());
gtk_signal_connect (GTK_OBJECT (prefs->prompt_empty_subject), "toggled",
diff --git a/mail/mail-composer-prefs.h b/mail/mail-composer-prefs.h
index 3c559ea926..37dc78f29f 100644
--- a/mail/mail-composer-prefs.h
+++ b/mail/mail-composer-prefs.h
@@ -67,6 +67,7 @@ struct _MailComposerPrefs {
/* Default Behavior */
GtkToggleButton *send_html;
+ GtkToggleButton *auto_smileys;
GtkToggleButton *prompt_empty_subject;
GtkToggleButton *prompt_bcc_only;
GtkOptionMenu *charset;