Merge lp:~abreu-alexandre/unity-webapps-gmail/fix-gmail-wmstartup-and-name into lp:unity-webapps-gmail

[Alexandre Abreu]

GMail startupwmclass & various file names were messed up & not in sync w/ the webapp name (defined as 'Gmail')

GMail startupwmclass & various file names were messed up & not in sync w/ the webapp name (defined as 'Gmail')

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-trusty-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-trusty-armhf-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-gmail-ci/22/rebuild

review: Approve (continuous-integration)

[Justin McPherson (justinmcp)]

APP_ID in the update script is also used to discover the .desktop files name. It will need to check both case forms to function correctly.

review: Needs Fixing

[lp:~abreu-alexandre/unity-webapps-gmail/fix-gmail-wmstartup-and-name]

92. By Alexandre Abreu on 2014-03-06

handle both desktop filenames

[Alexandre Abreu (abreu-alexandre)]

> APP_ID in the update script is also used to discover the .desktop files name.
> It will need to check both case forms to function correctly.

updated

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-trusty-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-trusty-armhf-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-gmail-ci/23/rebuild

review: Approve (continuous-integration)

[lp:~abreu-alexandre/unity-webapps-gmail/fix-gmail-wmstartup-and-name]

93. By Alexandre Abreu on 2014-03-07

fix premature return

[Justin McPherson (justinmcp)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-trusty-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-trusty-armhf-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-gmail-ci/24/rebuild

review: Approve (continuous-integration)

[David Barth (dbarth)]

Fix applied correctly and verified to work in the silo build

=== renamed file 'GMailmailgooglecom.desktop' => 'Gmailmailgooglecom.desktop'
--- GMailmailgooglecom.desktop	2013-09-24 16:15:51 +0000
+++ Gmailmailgooglecom.desktop	2014-03-07 01:13:04 +0000
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=GMail
+Name=Gmail
 Type=Application
 Icon=unity-webapps-gmail
 MimeType=
 Actions=S0;S1;S2;S3;S4;S5;S6;S7;S8;S9;S10;
-Exec=unity-webapps-runner -n 'R01haWw=' -d 'mail.google.com' %u
-StartupWMClass=GMailmailgooglecom
+Exec=unity-webapps-runner -n 'R21haWw=' -d 'mail.google.com' %u
+StartupWMClass=Gmailmailgooglecom
     
\ No newline at end of file

=== modified file 'debian/install'
--- debian/install	2013-09-24 16:15:51 +0000
+++ debian/install	2014-03-07 01:13:04 +0000
@@ -6,4 +6,4 @@
 64/unity-webapps-gmail.png usr/share/icons/unity-webapps-applications/64/apps
 manifest.json usr/share/unity-webapps/userscripts/unity-webapps-gmail
 
-GMailmailgooglecom.desktop usr/share/applications
+Gmailmailgooglecom.desktop usr/share/applications

=== modified file 'scripts/update-desktop-file-unity-webapps-gmail.py'
--- scripts/update-desktop-file-unity-webapps-gmail.py	2013-09-24 16:15:51 +0000
+++ scripts/update-desktop-file-unity-webapps-gmail.py	2014-03-07 01:13:04 +0000
@@ -5,7 +5,8 @@
 import glob
 import re
 
-APP_ID = 'GMailmailgooglecom'
+APP_ID = 'Gmailmailgooglecom'
+DESKTOP_FILENAMES = ['Gmailmailgooglecom.desktop', 'GMailmailgooglecom.desktop']
 
 def get_local_applications_path():
     return os.path.join(glib.get_user_data_dir(), 'applications')
@@ -15,20 +16,20 @@
     if not os.path.exists(local_applications_path) or not os.path.isdir(local_applications_path):
         return
 
-    desktop_filename = os.path.join(local_applications_path, '{0}.desktop'.format(APP_ID))
-    if not os.path.exists(desktop_filename) or not os.path.isfile(desktop_filename):
-        return
-
-    try:
-        desktop_file_content = open(desktop_filename).read()
-        start_idx = desktop_file_content.find('[Desktop Entry]')
-        if start_idx != -1 and desktop_file_content.find('StartupWMClass') == -1:
-            start_idx += len('[Desktop Entry]')
-            updated_desktop_file_content = desktop_file_content[:start_idx] + '\nStartupWMClass={0}'.format(APP_ID) + desktop_file_content[start_idx:]
-            open(desktop_filename, "w+").write(updated_desktop_file_content)
-    except Exception, e:
-        print 'Error while upgrading the desktop file: ', str(e)
+    for desktop_filename in DESKTOP_FILENAMES:
+        desktop_filename = os.path.join(local_applications_path, desktop_filename)
+        if not os.path.exists(desktop_filename) or not os.path.isfile(desktop_filename):
+            continue
+        try:
+            desktop_file_content = open(desktop_filename).read()
+            start_idx = desktop_file_content.find('[Desktop Entry]')
+            if start_idx != -1 and desktop_file_content.find('StartupWMClass') == -1:
+                start_idx += len('[Desktop Entry]')
+                updated_desktop_file_content = desktop_file_content[:start_idx] + '\nStartupWMClass={0}'.format(APP_ID) + desktop_file_content[start_idx:]
+                open(desktop_filename, "w+").write(updated_desktop_file_content)
+        except Exception, e:
+            print 'Error while upgrading the desktop file: ', str(e)
 
 if __name__ == "__main__":
     update_desktop_file_startupwmclass()
-    
\ No newline at end of file
+