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/mail-config.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/mail-config.c')
| -rw-r--r-- | mail/mail-config.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/mail/mail-config.c b/mail/mail-config.c index 09c4cd662c..43a0e8b65b 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -102,6 +102,7 @@ typedef struct { GSList *jh_header; gboolean jh_check; gboolean book_lookup; + gboolean book_lookup_local_only; } MailConfig; static MailConfig *config = NULL; @@ -498,6 +499,14 @@ mail_config_init (void) config->book_lookup = gconf_client_get_bool (config->gconf, key, NULL); + key = "/apps/evolution/mail/junk/lookup_addressbook_local_only"; + func = (GConfClientNotifyFunc) gconf_bool_value_changed; + gconf_client_notify_add ( + config->gconf, key, func, + &config->book_lookup_local_only, NULL, NULL); + config->book_lookup_local_only = + gconf_client_get_bool (config->gconf, key, NULL); + gconf_jh_check_changed (config->gconf, 0, NULL, config); } @@ -1147,7 +1156,7 @@ mail_config_remove_signature (ESignature *signature) } void -mail_config_reload_junk_headers () +mail_config_reload_junk_headers (void) { /* It automatically sets in the session */ if (config == NULL) @@ -1158,14 +1167,23 @@ mail_config_reload_junk_headers () } gboolean -mail_config_get_lookup_book() +mail_config_get_lookup_book (void) { /* It automatically sets in the session */ if (config == NULL) mail_config_init (); return config->book_lookup; +} + +gboolean +mail_config_get_lookup_book_local_only (void) +{ + /* It automatically sets in the session */ + if (config == NULL) + mail_config_init (); + return config->book_lookup_local_only; } char * |