Merge lp:~dbarth/unity-webapps-googleplus/fix-desktop-icon-name into lp:unity-webapps-googleplus

Proposed by David Barth
Status: Merged
Approved by: David Barth
Approved revision: 58
Merged at revision: 57
Proposed branch: lp:~dbarth/unity-webapps-googleplus/fix-desktop-icon-name
Merge into: lp:unity-webapps-googleplus
Diff against target: 36 lines (+4/-4)
3 files modified
GooglePlus.user.js (+1/-1)
GooglePlusplusgooglecom.desktop (+2/-2)
manifest.json (+1/-1)
To merge this branch: bzr merge lp:~dbarth/unity-webapps-googleplus/fix-desktop-icon-name
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+214315@code.launchpad.net

Commit message

Fix the desktop file icon name

Description of the change

Fix the desktop file icon name

To post a comment you must log in.
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

can you also fix the webapp 'name' in the user.js file ... it;s 'Google+' :/

Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

Please update the manifest.json to:

{"includes":["https://plus.google.com/*", "https://accounts.google.*/*", "https://www.google.com/a/*"],"requires":["utils.js","google-common.js"],"name":"GooglePlus","domain": "plus.google.com", "scripts":["GooglePlus.user.js"],"maintainer":"Webapps Team <email address hidden>","license":"GPL-3","manifest-version":"1.0","integration-version":"2.4.12","package-name":"GooglePlus","description":"Unity Webapp for GooglePlus", "homepage":"https://plus.google.com/","icons":{"128":"128/unity-webapps-google-plus.png","48":"48/unity-webapps-google-plus.png","52":"52/unity-webapps-google-plus.png","64":"64/unity-webapps-google-plus.png"}}

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
58. By David Barth

manifest and js name fixes

Revision history for this message
Alexandre Abreu (abreu-alexandre) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'GooglePlus.user.js'
2--- GooglePlus.user.js 2013-06-20 17:37:36 +0000
3+++ GooglePlus.user.js 2014-04-04 18:24:07 +0000
4@@ -237,7 +237,7 @@
5 getImg(appName);
6 localStorage.setItem(appName, true);
7 }), 2000);*/
8- Unity.init({ name: "Google+",
9+ Unity.init({ name: "GooglePlus",
10 domain: 'plus.google.com',
11 homepage: 'https://plus.google.com/',
12 iconUrl: "icon://unity-webapps-google-plus",
13
14=== modified file 'GooglePlusplusgooglecom.desktop'
15--- GooglePlusplusgooglecom.desktop 2013-09-24 16:22:05 +0000
16+++ GooglePlusplusgooglecom.desktop 2014-04-04 18:24:07 +0000
17@@ -1,9 +1,9 @@
18 [Desktop Entry]
19 Name=GooglePlus
20 Type=Application
21-Icon=unity-webapps-googleplus
22+Icon=unity-webapps-google-plus
23 MimeType=
24 Actions=S0;S1;S2;S3;S4;S5;S6;S7;S8;S9;S10;
25 Exec=unity-webapps-runner -n 'R29vZ2xlUGx1cw==' -d 'plus.google.com' %u
26 StartupWMClass=GooglePlusplusgooglecom
27-
28\ No newline at end of file
29+
30
31=== modified file 'manifest.json'
32--- manifest.json 2013-09-16 19:55:34 +0000
33+++ manifest.json 2014-04-04 18:24:07 +0000
34@@ -1,1 +1,1 @@
35-{"includes":["https://plus.google.com/*"],"requires":["utils.js","google-common.js"],"name":"GooglePlus","domain": "plus.google.com", "scripts":["GooglePlus.user.js"],"maintainer":"Webapps Team <webapps@lists.launchpad.net>","license":"GPL-3","manifest-version":"1.0","integration-version":"2.4.12","package-name":"GooglePlus","description":"Unity Webapp for GooglePlus"}
36+{"includes":["https://plus.google.com/*", "https://accounts.google.*/*", "https://www.google.com/a/*"],"requires":["utils.js","google-common.js"],"name":"GooglePlus","domain": "plus.google.com", "scripts":["GooglePlus.user.js"],"maintainer":"Webapps Team <webapps@lists.launchpad.net>","license":"GPL-3","manifest-version":"1.0","integration-version":"2.4.12","package-name":"GooglePlus","description":"Unity Webapp for GooglePlus", "homepage":"https://plus.google.com/","icons":{"128":"128/unity-webapps-google-plus.png","48":"48/unity-webapps-google-plus.png","52":"52/unity-webapps-google-plus.png","64":"64/unity-webapps-google-plus.png"}}

Subscribers

People subscribed via source and target branches

to all changes: