/jds/bin/diff -uprN gnome-panel-2.27.91.old/gnome-panel/panel-default-setup.entries gnome-panel-2.27.91/gnome-panel/panel-default-setup.entries
--- gnome-panel-2.27.91.old/gnome-panel/panel-default-setup.entries 2009-08-26 17:20:04.202690000 +0100
+++ gnome-panel-2.27.91/gnome-panel/panel-default-setup.entries 2009-08-26 17:21:47.749945000 +0100
@@ -5,8 +5,8 @@
<!-- List of toplevels -->
<entry>
- <key>general/toplevel_id_list</key>
- <schema_key>/schemas/apps/panel/general/toplevel_id_list</schema_key>
+ <key>general/toplevel_id_list_jds</key>
+ <schema_key>/schemas/apps/panel/general/toplevel_id_list_jds</schema_key>
<value>
<list type="string">
<value>
@@ -19,8 +19,8 @@
<!-- List of objects -->
<entry>
- <key>general/object_id_list</key>
- <schema_key>/schemas/apps/panel/general/object_id_list</schema_key>
+ <key>general/object_id_list_jds</key>
+ <schema_key>/schemas/apps/panel/general/object_id_list_jds</schema_key>
<value>
<list type="string">
<value>
@@ -33,8 +33,8 @@
<!-- List of applets -->
<entry>
- <key>general/applet_id_list</key>
- <schema_key>/schemas/apps/panel/general/applet_id_list</schema_key>
+ <key>general/applet_id_list_jds</key>
+ <schema_key>/schemas/apps/panel/general/applet_id_list_jds</schema_key>
<value>
<list type="string">
<value>
/jds/bin/diff -uprN gnome-panel-2.27.91.old/gnome-panel/panel-profile.c gnome-panel-2.27.91/gnome-panel/panel-profile.c
--- gnome-panel-2.27.91.old/gnome-panel/panel-profile.c 2009-08-26 17:20:04.106305000 +0100
+++ gnome-panel-2.27.91/gnome-panel/panel-profile.c 2009-08-26 17:23:09.254481000 +0100
@@ -2518,7 +2518,12 @@ panel_profile_load (void)
panel_compatibility_maybe_copy_old_config (client);
+ /* Commenting this out till we figure out a clean way to migrate
+ objects of previous version of a release to the newer version
+ along with the objects that we intend to add to the newer version
+
panel_compatibility_migrate_panel_id_list (client);
+ */
panel_profile_load_list (client,
PANEL_CONFIG_DIR,
/jds/bin/diff -uprN gnome-panel-2.27.91.old/gnome-panel/panel-gconf.c gnome-panel-2.27.91/gnome-panel/panel-gconf.c
--- gnome-panel-2.27.91.old/gnome-panel/panel-gconf.c 2009-08-26 17:20:04.144039000 +0100
+++ gnome-panel-2.27.91/gnome-panel/panel-gconf.c 2009-08-26 17:23:41.676124000 +0100
@@ -108,13 +108,13 @@ panel_gconf_key_type_to_id_list (PanelGC
switch (type) {
case PANEL_GCONF_TOPLEVELS:
- retval = "toplevel_id_list";
+ retval = "toplevel_id_list_jds";
break;
case PANEL_GCONF_APPLETS:
- retval = "applet_id_list";
+ retval = "applet_id_list_jds";
break;
case PANEL_GCONF_OBJECTS:
- retval = "object_id_list";
+ retval = "object_id_list_jds";
break;
default:
retval = NULL;