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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-08-27 12:28:33 +0300 (Thu, 27 Aug 2009)
New Revision: 19218

Modified:
   projects/haf/trunk/osso-app-killer/debian/changelog
   projects/haf/trunk/osso-app-killer/src/gconf-clean.sh
Log:
Omit /apps/activesync during RFS

Modified: projects/haf/trunk/osso-app-killer/debian/changelog
===================================================================
--- projects/haf/trunk/osso-app-killer/debian/changelog	2009-08-26 16:57:16 UTC (rev 19217)
+++ projects/haf/trunk/osso-app-killer/debian/changelog	2009-08-27 09:28:33 UTC (rev 19218)
@@ -1,3 +1,10 @@
+osso-app-killer (1.33-1) unstable; urgency=low
+
+  * Skip /apps/activesync during RFS
+  * Fixes: NB#132483 (Weird behaviour observed with MFE upon doing "Restore original settings".)
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Thu, 27 Aug 2009 11:29:24 +0300
+
 osso-app-killer (1.32-1) unstable; urgency=low
 
   * Copy contents of /etc/skel to /home/user after wiping /home/user

Modified: projects/haf/trunk/osso-app-killer/src/gconf-clean.sh
===================================================================
--- projects/haf/trunk/osso-app-killer/src/gconf-clean.sh	2009-08-26 16:57:16 UTC (rev 19217)
+++ projects/haf/trunk/osso-app-killer/src/gconf-clean.sh	2009-08-27 09:28:33 UTC (rev 19218)
@@ -101,6 +101,12 @@
             continue
           fi
 
+          # in ROS, paths having 'activesync' are preserved
+          echo "$f" | grep -e 'activesync' > /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