Branch: master

77165c2e 2014-07-05 09:51:39 Slávek Banko
Update r14-xdg-update: add renaming kde- => tde- in Favorites and FirstSeenApps in kickerrc
M r14-xdg-update
diff --git a/r14-xdg-update b/r14-xdg-update
index 7e00c2f..ee7d6c9 100644
--- a/r14-xdg-update
+++ b/r14-xdg-update
@@ -3,7 +3,7 @@
 # A script to perform R14.0.0 XDG compliance updates.
 
 SCRIPT_NAME="`basename \`readlink -f $0\``"
-SCRIPT_VERSION=201403020
+SCRIPT_VERSION=201407050
 
 # This script should be needed to run only once, but corner cases
 # and file/directory permissions could cause incomplete updates.
@@ -379,14 +379,13 @@
 fi
 
 # Preserve kicker/panel icons.
-if [ "$R14_VERSION" -lt "201309150" ]; then
+if [ "$R14_VERSION" -lt "201407050" ]; then
   if [ -r $PROFILE_DIR/share/config/kickerrc ]; then
     Log "Updating kicker/panel customizations in kickerrc."
-    if [ -r "$PROFILE_DIR/share/config/kickerrc" ]; then
-      sed -i 's|StorageId\[\$e\]=kde-|StorageId\[\$e\]=tde-|g' "$PROFILE_DIR/share/config/kickerrc" 2>/dev/null
-    else
-      Log "kickerrc does not exist."
-    fi
+    sed -i 's|StorageId\[\$e\]=kde-|StorageId\[\$e\]=tde-|g' "$PROFILE_DIR/share/config/kickerrc" 2>/dev/null
+    sed -i '/^\(Favorites\|FirstSeenApps\)/s|\([=,]\)kde-|\1tde-|gp' "$PROFILE_DIR/share/config/kickerrc" 2>/dev/null
+  else
+    Log "kickerrc does not exist."
   fi
 fi
 if [ "$R14_VERSION" -lt "201309150" ]; then
46c39bc0 2014-07-05 09:56:12 Slávek Banko
Remove external programs from default-favs
M kicker/kicker/ui/default-favs
diff --git a/kicker/kicker/ui/default-favs b/kicker/kicker/ui/default-favs
index 47522fc..64cffc6 100644
--- a/kicker/kicker/ui/default-favs
+++ b/kicker/kicker/ui/default-favs
@@ -1,9 +1,9 @@
-MozillaFirefox.desktop
+tde-konqbrowser.desktop
+tde-Home.desktop
 tde-Kontact.desktop
-writer.desktop
+tde-kate.desktop
 tde-amarok.desktop
 tde-digikam.desktop
-tde-Home.desktop
+tde-konsole.desktop
 tde-KControl.desktop
 tde-Help.desktop
-tde-konsole.desktop