aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-02-27 02:35:52 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-02-27 02:35:52 +0800
commitd3a45d74151227b034628006f159ece45c22c9df (patch)
treeee4eeee88a89954c1a7045eb0a91ed1b5d2a8180
parent66b36e63deeda84d042340293fc6c047df297c9d (diff)
downloadgsoc2013-evolution-d3a45d74151227b034628006f159ece45c22c9df.tar
gsoc2013-evolution-d3a45d74151227b034628006f159ece45c22c9df.tar.gz
gsoc2013-evolution-d3a45d74151227b034628006f159ece45c22c9df.tar.bz2
gsoc2013-evolution-d3a45d74151227b034628006f159ece45c22c9df.tar.lz
gsoc2013-evolution-d3a45d74151227b034628006f159ece45c22c9df.tar.xz
gsoc2013-evolution-d3a45d74151227b034628006f159ece45c22c9df.tar.zst
gsoc2013-evolution-d3a45d74151227b034628006f159ece45c22c9df.zip
Change the type of load_http_images to INT rather than BOOL. Fixes bug
2003-02-26 Jeffrey Stedfast <fejj@ximian.com> * e-config-upgrade.c: Change the type of load_http_images to INT rather than BOOL. Fixes bug #38767. svn path=/trunk/; revision=20073
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/e-config-upgrade.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index e30d9189a2..b8ea1a0f27 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-26 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-config-upgrade.c: Change the type of load_http_images to INT
+ rather than BOOL. Fixes bug #38767.
+
2003-02-26 Dan Winship <danw@ximian.com>
* e-shell-startup-wizard.c (start_wizard): New routine to attempt
@@ -13,7 +18,8 @@
should not return any value if unset, so i'm not sure if this is
the right mechanism ...
- * e-config-upgrade.c: Upgrade settings from earlier versions of evolution.
+ * e-config-upgrade.c: Upgrade settings from earlier versions of
+ evolution.
* main.c (upgrade_from_1_0_if_needed): Removed.
(main): Call e_config_upgrade before going into gmainloop.
diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c
index 5cddd842c2..9848ac09e2 100644
--- a/shell/e-config-upgrade.c
+++ b/shell/e-config-upgrade.c
@@ -988,7 +988,7 @@ static struct _gconf_map mail_display_map[] = {
{ "paned_size", "mail/display/paned_size", BMAP_INT },
{ "seen_timeout", "mail/display/mark_seen_timeout", BMAP_INT },
{ "do_seen_timeout", "mail/display/mark_seen", BMAP_BOOL },
- { "http_images", "mail/display/load_http_images", BMAP_BOOL },
+ { "http_images", "mail/display/load_http_images", BMAP_INT },
{ "citation_highlight", "mail/display/mark_citations", BMAP_BOOL },
{ "citation_color", "mail/display/citation_colour", BMAP_COLOUR },
{ "x_mailer_display_style", "mail/display/xmailer_mask", BMAP_INT },