aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-config-upgrade.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 347dabb27e..616127ba0a 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-25 Chris Toshok <toshok@ximian.com>
+
+ * e-config-upgrade.c: add general_map and a reference to it in
+ gconf_remap_list. Should fix 44477.
+
2003-06-19 Dan Winship <danw@ximian.com>
* e-folder-tree.c (e_folder_tree_add): Don't leak parent_path,
diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c
index a1f0e14bd9..26ff6c247f 100644
--- a/shell/e-config-upgrade.c
+++ b/shell/e-config-upgrade.c
@@ -1352,6 +1352,11 @@ static struct _gconf_map calendar_alarmnotify_map[] = {
{ 0 },
};
+static struct _gconf_map general_map[] = {
+ /* /General */
+ { "CategoryMasterList", "general/category_master_list", BMAP_STRING }
+};
+
/* ********************************************************************** */
static struct {
@@ -1392,6 +1397,8 @@ static struct {
{ "/Calendar/DateNavigator", calendar_datenavigator_map },
{ "/Calendar/AlarmNotify", calendar_alarmnotify_map },
+ { "/General", general_map },
+
{ 0 },
};