Merge lp:~justinmcp/unity-webapps-facebookmessenger/app-name-fix-13.10 into lp:unity-webapps-facebookmessenger/13.10

Proposed by Justin McPherson on 2014-02-17
Status: Merged
Approved by: Alexandre Abreu on 2014-02-17
Approved revision: 68
Merged at revision: 68
Proposed branch: lp:~justinmcp/unity-webapps-facebookmessenger/app-name-fix-13.10
Merge into: lp:unity-webapps-facebookmessenger/13.10
Diff against target: 32 lines (+3/-3)
2 files modified
FacebookMessenger.test.js (+2/-2)
FacebookMessenger.user.js (+1/-1)
To merge this branch: bzr merge lp:~justinmcp/unity-webapps-facebookmessenger/app-name-fix-13.10
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) 2014-02-17 Approve on 2014-02-17
PS Jenkins bot (community) continuous-integration Approve on 2014-02-17
Review via email: mp+206652@code.launchpad.net

Description of the change

Fixes problem of two facebook launcher items appearing.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'FacebookMessenger.test.js'
--- FacebookMessenger.test.js 2013-04-30 20:40:06 +0000
+++ FacebookMessenger.test.js 2014-02-17 04:35:18 +0000
@@ -26,7 +26,7 @@
2626
27 validateCallLog: function (log, out) {27 validateCallLog: function (log, out) {
28 assertEquals('Unity.init', log[0].func, 'Unity.init');28 assertEquals('Unity.init', log[0].func, 'Unity.init');
29 assertEquals('facebook', log[0].args[0].name, 'facebook');29 assertEquals('FacebookMessenger', log[0].args[0].name, 'FacebookMessenger');
3030
31 assertEquals('Unity.init', log[2].func, 'Unity.init');31 assertEquals('Unity.init', log[2].func, 'Unity.init');
32 assertEquals('Login', log[2].args[0].login, this._login);32 assertEquals('Login', log[2].args[0].login, this._login);
@@ -41,4 +41,4 @@
41 },41 },
4242
43 scriptName: 'FacebookMessenger.user.js'43 scriptName: 'FacebookMessenger.user.js'
44};
45\ No newline at end of file44\ No newline at end of file
45};
4646
=== modified file 'FacebookMessenger.user.js'
--- FacebookMessenger.user.js 2013-06-17 20:37:11 +0000
+++ FacebookMessenger.user.js 2014-02-17 04:35:18 +0000
@@ -90,7 +90,7 @@
90 login = null;90 login = null;
91}91}
9292
93Unity.init({ name: "facebook",93Unity.init({ name: "FacebookMessenger",
94 iconUrl: "icon://unity-webapps-facebook",94 iconUrl: "icon://unity-webapps-facebook",
95 login: login,95 login: login,
96 domain: 'facebook.com',96 domain: 'facebook.com',

Subscribers

People subscribed via source and target branches

to all changes: