[maemo-commits] [maemo-commits] r15322 - in projects/haf/trunk/hildon-desktop: . data

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2008-03-26 10:35:33 +0200 (Wed, 26 Mar 2008)
New Revision: 15322

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/data/restore-menu.sh
Log:

2008-03-26  Johan Bilien  <johan.bilien at nokia.com>

	* data/restore-menu.sh: erase desktop configuration files when
	restoring a backup from an older software release.
	Fixes: NB#82941 "SSU: Restoring backup that does not have software
	update notifier disables the plugin"



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2008-03-25 22:31:33 UTC (rev 15321)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2008-03-26 08:35:33 UTC (rev 15322)
@@ -1,3 +1,10 @@
+2008-03-26  Johan Bilien  <johan.bilien at nokia.com>
+
+	* data/restore-menu.sh: erase desktop configuration files when
+	restoring a backup from an older software release.
+	Fixes: NB#82941 "SSU: Restoring backup that does not have software
+	update notifier disables the plugin"
+
 2008-03-19  Johan Bilien  <johan.bilien at nokia.com>
 
 	* configure.ac: 2.0.10

Modified: projects/haf/trunk/hildon-desktop/data/restore-menu.sh
===================================================================
--- projects/haf/trunk/hildon-desktop/data/restore-menu.sh	2008-03-25 22:31:33 UTC (rev 15321)
+++ projects/haf/trunk/hildon-desktop/data/restore-menu.sh	2008-03-26 08:35:33 UTC (rev 15322)
@@ -2,6 +2,7 @@
 
 OSSO_CONF_DIR="${HOME}/.osso"
 MENU_CONF_DIR="${OSSO_CONF_DIR}/menus"
+DESKTOP_CONF_DIR="${OSSO_CONF_DIR}/hildon-desktop"
 OSSO_SOFTWARE_VERSION_FILE="/etc/osso_software_version"
 
 if [ ! $2 ]
@@ -19,4 +20,5 @@
 if [ $2 != $OSSO_VERSION ]
 then
   rm -f "${MENU_CONF_DIR}/applications.menu"
+  rm -f "${DESKTOP_CONF_DIR}/*.conf"
 fi