gnome-panel-03-concurrent-login.diff revision 9124
13901N/A--- gnome-panel-2.6.1/gnome-panel/panel-gconf.c 2004-04-02 18:05:41.000000000 +0100
13901N/A+++ gnome-panel-2.6.1-new/gnome-panel/panel-gconf.c 2004-10-08 11:17:41.343758872 +0100
13901N/A@@ -104,13 +104,13 @@ panel_gconf_key_type_to_id_list (PanelGC
13901N/A
13901N/A switch (type) {
13901N/A case PANEL_GCONF_TOPLEVELS:
13901N/A- retval = "toplevel_id_list";
13901N/A+ retval = "toplevel_id_list_jds";
13901N/A break;
13901N/A 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;
--- gnome-panel-2.6.1/gnome-panel/panel-profile.c 2004-04-02 18:05:41.000000000 +0100
+++ gnome-panel-2.6.1-new/gnome-panel/panel-profile.c 2004-10-08 11:19:29.073381480 +0100
@@ -2365,8 +2365,14 @@ 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 in the newer version
+
panel_compatibility_migrate_panel_id_list (client);
+ */
+
gconf_client_add_dir (client, PANEL_CONFIG_DIR "/general", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
panel_profile_load_list (client,
--- gnome-panel-2.6.1/gnome-panel/panel-default-setup.entries 2004-10-07 19:02:01.000000000 +0100
+++ gnome-panel-2.6.1-new/gnome-panel/panel-default-setup.entries 2004-10-08 11:17:17.548376320 +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>