16765N/A/jds/bin/diff -uprN gnome-panel-2.26.3.old/gnome-panel/panel-default-setup.entries gnome-panel-2.26.3/gnome-panel/panel-default-setup.entries

16765N/A--- gnome-panel-2.26.3.old/gnome-panel/panel-default-setup.entries 2009-07-01 18:35:33.817195000 +0100

16765N/A+++ gnome-panel-2.26.3/gnome-panel/panel-default-setup.entries 2009-07-01 18:36:30.315353000 +0100

9124N/A@@ -5,8 +5,8 @@

9124N/A <!-- List of toplevels -->

9124N/A

9124N/A <entry>

9124N/A- <key>general/toplevel_id_list</key>

9124N/A- <schema_key>/schemas/apps/panel/general/toplevel_id_list</schema_key>

9124N/A+ <key>general/toplevel_id_list_jds</key>

9124N/A+ <schema_key>/schemas/apps/panel/general/toplevel_id_list_jds</schema_key>

9124N/A <value>

9124N/A <list type="string">

9124N/A <value>

9124N/A@@ -19,8 +19,8 @@

9124N/A <!-- List of objects -->

9124N/A

9124N/A <entry>

9124N/A- <key>general/object_id_list</key>

9124N/A- <schema_key>/schemas/apps/panel/general/object_id_list</schema_key>

9124N/A+ <key>general/object_id_list_jds</key>

9124N/A+ <schema_key>/schemas/apps/panel/general/object_id_list_jds</schema_key>

9124N/A <value>

9124N/A <list type="string">

9124N/A <value>

9124N/A@@ -33,8 +33,8 @@

9124N/A <!-- List of applets -->

9124N/A

9124N/A <entry>

9124N/A- <key>general/applet_id_list</key>

9124N/A- <schema_key>/schemas/apps/panel/general/applet_id_list</schema_key>

9124N/A+ <key>general/applet_id_list_jds</key>

9124N/A+ <schema_key>/schemas/apps/panel/general/applet_id_list_jds</schema_key>

9124N/A <value>

9124N/A <list type="string">

9124N/A <value>

16765N/A/jds/bin/diff -uprN gnome-panel-2.26.3.old/gnome-panel/panel-profile.c gnome-panel-2.26.3/gnome-panel/panel-profile.c

16765N/A--- gnome-panel-2.26.3.old/gnome-panel/panel-profile.c 2009-04-19 18:45:09.000000000 +0100

16765N/A+++ gnome-panel-2.26.3/gnome-panel/panel-profile.c 2009-07-01 18:36:30.026959000 +0100

16765N/A@@ -2516,7 +2516,13 @@ panel_profile_load (void)

16765N/A

16765N/A panel_compatibility_maybe_copy_old_config (client);

16765N/A

16765N/A+ /* Commenting this out till we figure out a clean way to migrate

16765N/A+ objects of previous version of a release to the newer version

16765N/A+ along with the objects that we intend to add to the newer version

16765N/A+

16765N/A panel_compatibility_migrate_panel_id_list (client);

16765N/A+

16765N/A+ */

16765N/A

16765N/A gconf_client_add_dir (client, PANEL_CONFIG_DIR "/general", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);

16765N/A

16765N/A/jds/bin/diff -uprN gnome-panel-2.26.3.old/gnome-panel/panel-gconf.c gnome-panel-2.26.3/gnome-panel/panel-gconf.c

16765N/A--- gnome-panel-2.26.3.old/gnome-panel/panel-gconf.c 2009-04-19 18:45:09.000000000 +0100

16765N/A+++ gnome-panel-2.26.3/gnome-panel/panel-gconf.c 2009-07-01 18:36:30.114632000 +0100

16765N/A@@ -108,13 +108,13 @@ panel_gconf_key_type_to_id_list (PanelGC

16765N/A

16765N/A switch (type) {

16765N/A case PANEL_GCONF_TOPLEVELS:

16765N/A- retval = "toplevel_id_list";

16765N/A+ retval = "toplevel_id_list_jds";

16765N/A break;

16765N/A case PANEL_GCONF_APPLETS:

16765N/A- retval = "applet_id_list";

16765N/A+ retval = "applet_id_list_jds";

16765N/A break;

16765N/A case PANEL_GCONF_OBJECTS:

16765N/A- retval = "object_id_list";

16765N/A+ retval = "object_id_list_jds";

16765N/A break;

16765N/A default:

16765N/A retval = NULL;