[maemo-commits] [maemo-commits] r17957 - in projects/haf/trunk/osso-app-killer: debian src

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-04-01 15:52:33 +0300 (Wed, 01 Apr 2009)
New Revision: 17957

Modified:
   projects/haf/trunk/osso-app-killer/debian/changelog
   projects/haf/trunk/osso-app-killer/src/gconf-clean.sh
Log:
Preserve home shortcuts

Modified: projects/haf/trunk/osso-app-killer/debian/changelog
===================================================================
--- projects/haf/trunk/osso-app-killer/debian/changelog	2009-04-01 12:43:18 UTC (rev 17956)
+++ projects/haf/trunk/osso-app-killer/debian/changelog	2009-04-01 12:52:33 UTC (rev 17957)
@@ -1,3 +1,13 @@
+osso-app-killer (1.28-1) unstable; urgency=low
+
+  * Skip over /apps/osso/hildon-desktop/applets, and /apps/osso/hildon-home during
+    gconf-clean.sh
+  * Fixes: NB#102054 (Home shortcuts (inserted by user) are effected by Restore original settings.)
+  * Do not yet skip over /apps/modest/accounts, because it's not enough to save email accounts
+  * Does not yet fix NB#105630 (Email account erased after performing restore original settings), but will do so RSN(TM)
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed,  1 Apr 2009 15:08:05 +0300
+
 osso-app-killer (1.27-1) unstable; urgency=low
 
   * Stop icd2 during CUD

Modified: projects/haf/trunk/osso-app-killer/src/gconf-clean.sh
===================================================================
--- projects/haf/trunk/osso-app-killer/src/gconf-clean.sh	2009-04-01 12:43:18 UTC (rev 17956)
+++ projects/haf/trunk/osso-app-killer/src/gconf-clean.sh	2009-04-01 12:52:33 UTC (rev 17957)
@@ -88,11 +88,31 @@
       # special handling for subdirectory 'apps'
       if [ "x$CUD" = "x" ]; then
         for f in `find apps -name *.xml`; do
+
           # in ROS, paths having 'telepathy' are preserved
           echo "$f" | grep -e 'telepathy' > /dev/null
           if [ $? = 0 ]; then
             continue
           fi
+
+          # in ROS, paths having 'hildon-desktop/applets' are preserved
+          echo "$f" | grep -e 'hildon-desktop/applets' > /dev/null
+          if [ $? = 0 ]; then
+            continue
+          fi
+
+#          # in ROS, paths having 'modest/accounts' are preserved
+#          echo "$f" | grep -e 'modest/accounts' > /dev/null
+#          if [ $? = 0 ]; then
+#            continue
+#          fi
+
+          # in ROS, paths having 'hildon-home' are preserved
+          echo "$f" | grep -e 'hildon-home' > /dev/null
+          if [ $? = 0 ]; then
+            continue
+          fi
+
           echo "$0: removing $f"
           empty_file $f
         done