Mailinglist Archive: opensuse-commit (1206 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package gnome-session
checked in at Wed May 24 02:45:07 CEST 2006.

--------
--- GNOME/gnome-session/gnome-session.changes	2006-05-13 04:16:16.000000000 +0200
+++ gnome-session/gnome-session.changes	2006-05-21 20:59:09.000000000 +0200
@@ -1,0 +2,6 @@
+Sun May 21 20:57:55 CEST 2006 - jpr@xxxxxxx
+
+- Reset the user's UI if upgrading from NLD9/SLES9 to SLED10, leave ui
+for SLES10 upgrades (#174123)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-session.spec ++++++
--- /var/tmp/diff_new_pack.OIMIDE/_old	2006-05-24 02:44:18.000000000 +0200
+++ /var/tmp/diff_new_pack.OIMIDE/_new	2006-05-24 02:44:18.000000000 +0200
@@ -18,7 +18,7 @@
 Group:          System/GUI/GNOME
 Autoreqprov:    on
 Version:        2.12.0
-Release:        109
+Release:        110
 Summary:        Session Tools for the GNOME 2.x Desktop
 Source:         gnome-session-%{version}.tar.bz2
 Source1:        gnome
@@ -150,6 +150,9 @@
 %dir /usr/share/xsessions
 
 %changelog -n gnome-session
+* Sun May 21 2006 - jpr@xxxxxxx
+- Reset the user's UI if upgrading from NLD9/SLES9 to SLED10, leave ui
+  for SLES10 upgrades (#174123)
 * Sat May 13 2006 - hpj@xxxxxxx
 - Update keyring unlockage patch to try both CASA's
   Gnome_Keyring_Default and Desktop passwords. Part of fix for

++++++ gnome ++++++
--- GNOME/gnome-session/gnome	2006-05-09 18:40:37.000000000 +0200
+++ gnome-session/gnome	2006-05-22 20:12:40.000000000 +0200
@@ -159,9 +159,28 @@
 
 }
 		
+function use_sled10_default {
+# do this only for SLED 10
+([ -e /etc/SuSE-release ] && grep "SUSE Linux Enterprise Desktop 10" /etc/SuSE-release) || return 
+
+# do this only one time
+[ -e $HOME/.skel/sled10-run ] && return
+
+# dump the existing config for backup
+PANEL_BACKUP=panel-gconf-`date '+%m%d%y%H%M%S'`.xml
+gconftool-2 --dump /apps/panel > $PANEL_BACKUP
+
+# unset the current panel configuration
+gconftool-2 --recursive-unset /apps/panel/default_setup
+gconftool-2 --unset /apps/panel/general/toplevel_id_list
+gconftool-2 --unset /apps/panel/general/applet_id_list
+gconftool-2 --unset /apps/panel/general/object_id_list
+gconftool-2 --recursive-unset /apps/panel/profiles/default
+gconftool-2 --recursive-unset /apps/panel/toplevels
 
-
-
+# we are done, set the flag
+touch ~/.skel/sled10-run
+}
 
 
 # set up an arbitrary icon path for nautilus, accessing YaST Icons and, if installed, common KDE icons
@@ -175,9 +194,21 @@
 
 
 # start up the gnome2 session
+
+# reset the SLED 10 UI only if upgrading from NLD9/SLES9, anything newer we 
+# ignore (like SL 9.3), the logic here is redundant but its low risk
+TRY_SLED10=1
+if [ -e $HOME/.skel/gnome2-run-9.2 ] ; then
+  TRY_SLED10=0
+fi
+
 fix_wallpapers_on_update
 use_gnome2_default
-
+if [ $TRY_SLED10 -gt 0 ] ; then
+ use_sled10_default
+else
+ touch ~/.skel/sled10-run
+fi
 
 
 



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...