aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2003-04-01 12:11:01 +0800
committerMichael Zucci <zucchi@src.gnome.org>2003-04-01 12:11:01 +0800
commit9e89da7be514471a3dadcc2f645269e3f1513ab7 (patch)
tree94f354adc174386c7ea6c302048e86b9ebb4ca04 /shell
parent7bbc53fbefca6eeafb24d9a991208879a9a08c33 (diff)
downloadgsoc2013-evolution-9e89da7be514471a3dadcc2f645269e3f1513ab7.tar
gsoc2013-evolution-9e89da7be514471a3dadcc2f645269e3f1513ab7.tar.gz
gsoc2013-evolution-9e89da7be514471a3dadcc2f645269e3f1513ab7.tar.bz2
gsoc2013-evolution-9e89da7be514471a3dadcc2f645269e3f1513ab7.tar.lz
gsoc2013-evolution-9e89da7be514471a3dadcc2f645269e3f1513ab7.tar.xz
gsoc2013-evolution-9e89da7be514471a3dadcc2f645269e3f1513ab7.tar.zst
gsoc2013-evolution-9e89da7be514471a3dadcc2f645269e3f1513ab7.zip
[#40474]
2003-04-01 Not Zed <NotZed@Ximian.com> [#40474] * e-config-upgrade.c (gconf_remap_list[]): The summary settings start at "My-Evolution", not "/My-Evolution". (import_bonobo_config): Same for mail summary settings, and hex decode the string for the strlist. Add a few extra debug printf's. svn path=/trunk/; revision=20606
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog10
-rw-r--r--shell/e-config-upgrade.c21
2 files changed, 23 insertions, 8 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index ba7aecdd52..d4f8e00991 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,13 @@
+2003-04-01 Not Zed <NotZed@Ximian.com>
+
+ [#40474]
+
+ * e-config-upgrade.c (gconf_remap_list[]): The summary settings
+ start at "My-Evolution", not "/My-Evolution".
+ (import_bonobo_config): Same for mail summary settings, and hex
+ decode the string for the strlist. Add a few extra debug
+ printf's.
+
2003-03-28 Ettore Perazzoli <ettore@ximian.com>
[#40377]
diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c
index e096b74c6b..2cbcad315b 100644
--- a/shell/e-config-upgrade.c
+++ b/shell/e-config-upgrade.c
@@ -821,7 +821,7 @@ static char *lookup_string(xmlNodePtr source, const char *name, struct _map_tabl
xmlFree(val);
} else
res = NULL;
-
+
return res;
}
@@ -1243,10 +1243,10 @@ static struct {
{ "/Importer/Pine", importer_pine_map },
{ "/Importer/Netscape", importer_netscape_map },
- { "/My-Evolution/Mail", myev_mail_map },
- { "/My-Evolution/RDF", myev_rdf_map },
- { "/My-Evolution/Weather", myev_weather_map },
- { "/My-Evolution/Schedule", myev_schedule_map },
+ { "My-Evolution/Mail", myev_mail_map },
+ { "My-Evolution/RDF", myev_rdf_map },
+ { "My-Evolution/Weather", myev_weather_map },
+ { "My-Evolution/Schedule", myev_schedule_map },
{ "/Shell", shell_map },
{ "/Shell/Views/0", shell_views_map },
@@ -1369,14 +1369,18 @@ static int import_bonobo_config(xmlDocPtr config_doc, GConfClient *gconf)
gconf_client_set_float(gconf, path, strtod(val, NULL), NULL);
break;
case BMAP_STRLIST:{
- char **t = g_strsplit (val, " !<-->! ", 8196);
+ char *v = hex_decode(val);
+ char **t = g_strsplit (v, " !<-->! ", 8196);
list = NULL;
- for (k=0;t[k];k++)
+ for (k=0;t[k];k++) {
list = g_slist_append(list, t[k]);
+ d(printf(" [%d] = '%s'\n", k, t[k]));
+ }
gconf_client_set_list(gconf, path, GCONF_VALUE_STRING, list, NULL);
g_slist_free(list);
g_strfreev(t);
+ g_free(v);
break;}
case BMAP_ANYLIST:{
xmlNodePtr node = source->children;
@@ -1491,7 +1495,7 @@ static int import_bonobo_config(xmlDocPtr config_doc, GConfClient *gconf)
convert_xml_blob(gconf, config_doc, signature_map, "/Mail/Signatures", "/apps/evolution/mail/signatures", "signature", NULL);
/* My-Evolution folder lists */
- source = lookup_bconf_path(config_doc, "/My-Evolution/Mail");
+ source = lookup_bconf_path(config_doc, "My-Evolution/Mail");
if (source) {
char **t;
@@ -1508,6 +1512,7 @@ static int import_bonobo_config(xmlDocPtr config_doc, GConfClient *gconf)
for (i=0;t[i] && t[i+1];i+=2) {
list = g_slist_append(list, t[i]);
l = g_slist_append(l, t[i+1]);
+ d(printf(" [%d] = euri: '%s', puri: '%s'\n", i, t[i], t[i+1]));
}
if (list) {
gconf_client_set_list(gconf, "/apps/evolution/summary/mail/folder_evolution_uris", GCONF_VALUE_STRING, list, NULL);