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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-04-23 13:13:52 +0300 (Thu, 23 Apr 2009)
New Revision: 18146

Modified:
   projects/haf/trunk/osso-app-killer/debian/changelog
   projects/haf/trunk/osso-app-killer/src/gconf-clean.sh
Log:
Preserve email accounts during RFS

Modified: projects/haf/trunk/osso-app-killer/debian/changelog
===================================================================
--- projects/haf/trunk/osso-app-killer/debian/changelog	2009-04-23 09:03:01 UTC (rev 18145)
+++ projects/haf/trunk/osso-app-killer/debian/changelog	2009-04-23 10:13:52 UTC (rev 18146)
@@ -1,3 +1,10 @@
+osso-app-killer (1.30-1) unstable; urgency=low
+
+  * Skip over 'modest/(server_)?accounts' during RFS
+  * Fixes: NB#105630 (Email account erased after performing restore original settings)
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Thu, 23 Apr 2009 13:02:21 +0300
+
 osso-app-killer (1.29-1) unstable; urgency=low
 
   * Re-write script osso-clean-mmc.sh to handle Fremantle's MMC cleaning

Modified: projects/haf/trunk/osso-app-killer/src/gconf-clean.sh
===================================================================
--- projects/haf/trunk/osso-app-killer/src/gconf-clean.sh	2009-04-23 09:03:01 UTC (rev 18145)
+++ projects/haf/trunk/osso-app-killer/src/gconf-clean.sh	2009-04-23 10:13:52 UTC (rev 18146)
@@ -101,11 +101,12 @@
             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 'modest/accounts' and 'modest/server_accounts'
+          # are preserved
+          echo "$f" | grep -E 'modest/(server_)?accounts' > /dev/null
+          if [ $? = 0 ]; then
+            continue
+          fi
 
           # in ROS, paths having 'hildon-home' are preserved
           echo "$f" | grep -e 'hildon-home' > /dev/null