diff options
author | Dan Winship <danw@src.gnome.org> | 2001-05-23 03:14:05 +0800 |
---|---|---|
committer | Dan Winship <danw@src.gnome.org> | 2001-05-23 03:14:05 +0800 |
commit | 35f5f53a11ba1d7a8d648a0f4ee7e590a071d6d3 (patch) | |
tree | 3b5c079aa448ec3f9e3eca04c9a72e48d12dd2d2 /mail/mail-config.c | |
parent | e16ec956d76ab269e645e4c6d2f3eb5fbc01c027 (diff) | |
download | gsoc2013-evolution-35f5f53a11ba1d7a8d648a0f4ee7e590a071d6d3.tar.gz gsoc2013-evolution-35f5f53a11ba1d7a8d648a0f4ee7e590a071d6d3.tar.zst gsoc2013-evolution-35f5f53a11ba1d7a8d648a0f4ee7e590a071d6d3.zip |
If http mode is HTTP_SOMETIMES, use e_book_query_address_locally to check
* mail-display.c (on_url_requested): If http mode is
HTTP_SOMETIMES, use e_book_query_address_locally to check the From
address and load images if it's found.
* mail-config.c (config_read): Default http_mode to
MAIL_CONFIG_HTTP_SOMETIMES. Fix typo to make default forward style
actually work.
svn path=/trunk/; revision=9936
Diffstat (limited to 'mail/mail-config.c')
-rw-r--r-- | mail/mail-config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mail/mail-config.c b/mail/mail-config.c index 420ae587af..1560e6e602 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -458,11 +458,11 @@ config_read (void) evolution_dir); config->http_mode = gnome_config_get_int_with_default (str, &def); if (def) - config->http_mode = MAIL_CONFIG_HTTP_NEVER; + config->http_mode = MAIL_CONFIG_HTTP_SOMETIMES; g_free (str); /* Forwarding */ - str = g_strdup_printf ("=%s/config/Mail=/Format/defaul_forward_style", + str = g_strdup_printf ("=%s/config/Mail=/Format/default_forward_style", evolution_dir); config->default_forward_style = gnome_config_get_int_with_default (str, &def); if (def) |