Merge lp:~abreu-alexandre/webapps-applications/fix-migration-script-icon-order into lp:ubuntu/quantal/webapps-applications

[Alexandre Abreu]

[Ken VanDine (ken-vandine)]

Looks good, this has already been uploaded to quantal-proposed and merged into lp:ubuntu/quantal-proposed/webapps-applications

review: Approve

=== removed file 'debian/patches/dont-add-launchers-on-edubuntu'
--- debian/patches/dont-add-launchers-on-edubuntu	2012-09-25 16:58:17 +0000
+++ debian/patches/dont-add-launchers-on-edubuntu	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
---- webapps-applications-2.4.6.orig/scripts/install-default-webapps-in-launcher.py
-+++ webapps-applications-2.4.6/scripts/install-default-webapps-in-launcher.py
-@@ -1,5 +1,6 @@
- #!/usr/bin/python
- from gi.repository import Gio
-+import os
- 
- PREINSTALLED_LAUNCHER_DESKTOP_FILES = ["application://ubuntu-amazon-default.desktop", "application://UbuntuOneMusiconeubuntucom.desktop"]
- 
-@@ -7,6 +8,10 @@ UNITY_LAUNCHER_SETTINGS = "com.canonical
- UNITY_LAUNCHER_FAVORITE_KEY = "favorites"
- 
- def install_default_webapps_in_launcher():
-+    # Workaround for the script triggering on systems where it shouldn't.
-+    if os.path.exists("/usr/share/glib-2.0/schemas/95_edubuntu-artwork.gschema.override"):
-+        return
-+
-     new_desktop_files = PREINSTALLED_LAUNCHER_DESKTOP_FILES
- 
-     if len(new_desktop_files) != 0:

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-04 02:38:54 +0000
+++ debian/patches/series	2012-10-04 21:44:22 +0000
@@ -1,1 +1,1 @@
-dont-add-launchers-on-edubuntu
+

=== modified file 'scripts/install-default-webapps-in-launcher.py'
--- scripts/install-default-webapps-in-launcher.py	2012-10-04 00:05:53 +0000
+++ scripts/install-default-webapps-in-launcher.py	2012-10-04 21:44:22 +0000
@@ -1,12 +1,18 @@
 #!/usr/bin/python
 from gi.repository import Gio
+import os
 
 PREINSTALLED_LAUNCHER_DESKTOP_FILES = ["application://ubuntu-amazon-default.desktop", "application://UbuntuOneMusiconeubuntucom.desktop"]
+AFTER_ICON = "unity://running-apps"
 
 UNITY_LAUNCHER_SETTINGS = "com.canonical.Unity.Launcher"
 UNITY_LAUNCHER_FAVORITE_KEY = "favorites"
 
 def install_default_webapps_in_launcher():
+    # Workaround for the script triggering on systems where it shouldn't.
+    if os.path.exists("/usr/share/glib-2.0/schemas/95_edubuntu-artwork.gschema.override"):
+        return
+    
     new_desktop_files = PREINSTALLED_LAUNCHER_DESKTOP_FILES
 
     if len(new_desktop_files) != 0:
@@ -18,8 +24,23 @@
             favorites = settings.get_strv(UNITY_LAUNCHER_FAVORITE_KEY)
 
             # only append the desktop icons that are not already present in the favorites list if any
-            favorites.extend([desktop_file for desktop_file in new_desktop_files if not desktop_file in favorites])
+            to_add = [d for d in new_desktop_files if not d in favorites]
+            available_desktop_files = [d for d in favorites if ".desktop" in d]
+            new_index = -1
 
+            if len(available_desktop_files):
+                new_index = favorites.index(available_desktop_files[-1]) + 1
+            elif AFTER_ICON in favorites:
+                new_index = favorites.index(AFTER_ICON)
+                
+            if new_index >= 0:
+                new_index = favorites.index(AFTER_ICON)
+                next = favorites[new_index:]
+                favorites[new_index:] = to_add
+                favorites.extend(next)
+            else:
+                favorites.extend(to_add)
+            
             settings.set_strv(UNITY_LAUNCHER_FAVORITE_KEY, favorites)
             settings.sync()
         except: