diff options
| author | Milan Crha <mcrha@redhat.com> | 2008-04-23 17:29:11 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2008-04-23 17:29:11 +0800 |
| commit | 71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8 (patch) | |
| tree | 2b20aee8c3343c30a43923c8abcff8ef55996cdd /mail/em-mailer-prefs.c | |
| parent | 9364fe50368e2c48b1987edd43c92c1ecd1cd8cd (diff) | |
| download | gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar.gz gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar.bz2 gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar.lz gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar.xz gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar.zst gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.zip | |
** Fix for bug #529375
2008-04-23 Milan Crha <mcrha@redhat.com>
** Fix for bug #529375
* evolution-mail.schemas.in:
* mail-config.glade:
* em-utils.h: (em_utils_in_addressbook):
* em-utils.c: (em_utils_in_addressbook):
* em-format-html.c: (emfh_gethttp):
* mail-session.c: (lookup_addressbook):
* mail-config.h: (mail_config_get_lookup_book_local_only):
* mail-config.c: (struct MailConfig), (mail_config_init),
(mail_config_get_lookup_book_local_only):
* em-mailer-prefs.h: (struct _EMMailerPrefs):
* em-mailer-prefs.c: (junk_book_lookup_button_toggled),
(em_mailer_prefs_construct): Add new option
/apps/evolution/mail/junk/lookup_addressbook_local_only
to determine whether check for address in a local address book only.
svn path=/trunk/; revision=35410
Diffstat (limited to 'mail/em-mailer-prefs.c')
| -rw-r--r-- | mail/em-mailer-prefs.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index 26a68d0fc2..40b6188659 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -825,6 +825,13 @@ photo_toggle_changed (GtkToggleButton *toggle, EMMailerPrefs *prefs) } static void +junk_book_lookup_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) +{ + toggle_button_toggled (toggle, prefs); + gtk_widget_set_sensitive (GTK_WIDGET (prefs->junk_lookup_local_only), gtk_toggle_button_get_active (toggle)); +} + +static void custom_junk_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) { toggle_button_toggled (toggle, prefs); @@ -1493,10 +1500,17 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) prefs->junk_header_add = (GtkButton *)glade_xml_get_widget (gui, "junk_header_add"); prefs->junk_header_remove = (GtkButton *)glade_xml_get_widget (gui, "junk_header_remove"); prefs->junk_book_lookup = (GtkToggleButton *)glade_xml_get_widget (gui, "lookup_book"); + prefs->junk_lookup_local_only = (GtkToggleButton *)glade_xml_get_widget (gui, "junk_lookup_local_only"); toggle_button_init (prefs, prefs->junk_book_lookup, FALSE, "/apps/evolution/mail/junk/lookup_addressbook", + G_CALLBACK (junk_book_lookup_button_toggled)); + + toggle_button_init (prefs, prefs->junk_lookup_local_only, FALSE, + "/apps/evolution/mail/junk/lookup_addressbook_local_only", G_CALLBACK (toggle_button_toggled)); + junk_book_lookup_button_toggled (prefs->junk_book_lookup, prefs); + prefs->junk_header_list_store = init_junk_tree ((GtkWidget *)prefs->junk_header_tree, prefs); toggle_button_init (prefs, prefs->junk_header_check, FALSE, "/apps/evolution/mail/junk/check_custom_header", |