Commits

Patrick Cloke committed 02394fa

Working SIPE on Linux.

Comments (0)

Files changed (7)

+# HG changeset patch
+# Parent 2f2a9d8fadecb5d48ceab6e932ef118b54957ad1
+Bug 1720 - Follow-up to account preferences layout changes, r=fqueze.
+
+diff --git a/instantbird/content/account.js b/instantbird/content/account.js
+--- a/instantbird/content/account.js
++++ b/instantbird/content/account.js
+@@ -130,8 +130,8 @@
+     textbox.setAttribute("value", aValue);
+     textbox.setAttribute("id", aName);
+ 
+-    box.appendChild(textbox);
+-    return box;
++    row.appendChild(textbox);
++    return row;
+   },
+ 
+   createMenulist: function account_createMenulist(aList, aLabel, aName) {
 # HG changeset patch
-# Parent 06edb60cccae2f0a709cf9c20cb23296adf18afa
+# Parent c0e8ce6bb9fb3cb17ac07c724c76fb7f7dde7240
 Bug 1655 - Unhandled IRC messages around bans.
 
 diff --git a/chat/locales/en-US/irc.properties b/chat/locales/en-US/irc.properties
 --- a/chat/locales/en-US/irc.properties
 +++ b/chat/locales/en-US/irc.properties
-@@ -119,6 +119,11 @@ message.unknownNick=%S is an unknown nic
+@@ -119,6 +119,11 @@
  #    channel key (password).
  message.channelKeyAdded=%1$S changed the channel key to %2$S.
  message.channelKeyRemoved=%S removed the channel key.
 +#    This will be followed by a list of ban masks.
-+message.banMasks=The ban masks for %S are:
-+message.noBanMasks=There are no ban masks for %S.
-+message.banMaskAdded=%1$S added the ban mask: %2$S.
-+message.banMaskRemoved=%1$S removed the ban mask: %2$S.
++message.banMasks=Users connected from the following locations are banned from %S:
++message.noBanMasks=There are no banned locations for %S.
++message.banMaskAdded=Users connected from locations matching %1$S have been banned by %2$S.
++message.banMaskRemoved=Users connected from locations matching %1$S are no longer banned by %2$S.
  
  # LOCALIZATION NOTE (error.*):
  #    These are shown as error messages in the server tab.
 diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js
 --- a/chat/protocols/irc/irc.js
 +++ b/chat/protocols/irc/irc.js
-@@ -176,6 +176,7 @@ function ircChannel(aAccount, aName, aNi
+@@ -176,6 +176,7 @@
    this._init(aAccount, aName, aNick);
    this._modes = [];
    this._observedNicks = [];
  }
  ircChannel.prototype = {
    __proto__: GenericConvChatPrototype,
-@@ -184,6 +185,7 @@ ircChannel.prototype = {
+@@ -184,6 +185,7 @@
    // For IRC you're not in a channel until the JOIN command is received, open
    // all channels (initially) as left.
    _left: true,
  
    // Overwrite the writeMessage function to apply CTCP formatting before
    // display.
-@@ -363,7 +365,22 @@ ircChannel.prototype = {
+@@ -363,7 +365,22 @@
          this._chatRoomFields =
            this._account.getChatRoomDefaultFieldValues(newFields);
        }
 +            this.banMasks.filter(function (aBanMask) banMask != aBanMask);
 +          msgKey += "Removed";
 +        }
-+        this.writeMessage(aSetter, _(msgKey, aSetter, banMask), {system: true});
++        this.writeMessage(aSetter, _(msgKey, banMask, aSetter), {system: true});
 +      }
 +      else if (["e", "I", "l"].indexOf(aNewMode[i]) != -1) {
          // TODO The following have parameters that must be accounted for.
 diff --git a/chat/protocols/irc/ircBase.jsm b/chat/protocols/irc/ircBase.jsm
 --- a/chat/protocols/irc/ircBase.jsm
 +++ b/chat/protocols/irc/ircBase.jsm
-@@ -913,13 +913,23 @@ var ircBase = {
+@@ -913,13 +913,23 @@
       */
      "367": function(aMessage) { // RPL_BANLIST
        // <channel> <banmask>
 irc-isupport
 irc-cap
 irc-minor
-skypekit
+account.js
 sipe-mozconfig
+sipe-deps
 sipe
+sipe-aux
+sipe-po
+skipekit
 smileys
 normalizedName-fix
 irc-ident