From 57bf35dabe6524d071405a354ea87d0ccc7d76b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Mon, 4 Jun 2012 20:09:20 +0200
Subject: [PATCH] Bug 735215 - Enable Jabber / generic XMPP protocol, r=clokep.

--HG--
extra : rebase_source : 8138640c207d0d845b2701cbcef0ac949d56ad8f
---
 chat/protocols/xmpp/xmpp.js       | 2 +-
 chat/protocols/xmpp/xmpp.manifest | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js
index 55ce144627..7a269fcb5f 100644
--- a/chat/protocols/xmpp/xmpp.js
+++ b/chat/protocols/xmpp/xmpp.js
@@ -23,7 +23,7 @@ function XMPPProtocol() {
 XMPPProtocol.prototype = {
   __proto__: GenericProtocolPrototype,
   get normalizedName() "jabber",
-  get name() "XMPP (JS)",
+  get name() "XMPP",
   get iconBaseURI() "chrome://prpl-jabber/skin/",
   getAccount: function(aImAccount) new XMPPAccount(this, aImAccount),
   options: {
diff --git a/chat/protocols/xmpp/xmpp.manifest b/chat/protocols/xmpp/xmpp.manifest
index 614cc85eda..21934c3cb0 100644
--- a/chat/protocols/xmpp/xmpp.manifest
+++ b/chat/protocols/xmpp/xmpp.manifest
@@ -1,3 +1,3 @@
 component {dde786d1-6f59-43d0-9bc8-b505a757fb30} xmpp.js
 contract @mozilla.org/chat/xmpp;1 {dde786d1-6f59-43d0-9bc8-b505a757fb30}
-#category im-protocol-plugin prpl-jabber @mozilla.org/chat/xmpp;1
+category im-protocol-plugin prpl-jabber @mozilla.org/chat/xmpp;1 application={3550f703-e582-4d05-9a08-453d09bdfdc6}