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

[Justin McPherson]

Fixes problem of two facebook launcher items appearing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/unity-webapps-facebookmessenger-13.10-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-facebookmessenger-13.10-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-facebookmessenger-13.10-saucy-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-facebookmessenger-13.10-ci/2/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== 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 @@
 
     validateCallLog: function (log, out) {
         assertEquals('Unity.init', log[0].func, 'Unity.init');
-        assertEquals('facebook', log[0].args[0].name, 'facebook');
+        assertEquals('FacebookMessenger', log[0].args[0].name, 'FacebookMessenger');
 
         assertEquals('Unity.init', log[2].func, 'Unity.init');
         assertEquals('Login', log[2].args[0].login, this._login);
@@ -41,4 +41,4 @@
     },
 
     scriptName: 'FacebookMessenger.user.js'
-};
 \ No newline at end of file
+};
 
=== 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 @@
     login = null;
 }
 
-Unity.init({ name: "facebook",
+Unity.init({ name: "FacebookMessenger",
              iconUrl: "icon://unity-webapps-facebook",
              login: login,
              domain: 'facebook.com',