Browse Source

Rebase after pushes

Frank-Rainer Grahl 3 years ago
parent
commit
ecbef81ff3
1 changed files with 7 additions and 7 deletions
  1. 7 7
      comm-central/patches/TOP-1611647-2-fix-xul-references-suite.patch

+ 7 - 7
comm-central/patches/TOP-1611647-2-fix-xul-references-suite.patch

@@ -3,7 +3,7 @@
 # Date 1626813122 14400
 #      Tue Jul 20 16:32:02 2021 -0400
 # Node ID 1de38ba2521de8b67e9c4a651c27bccd08770286
-# Parent  c101a951178228b2e7072827a64e2d1cf8d21196
+# Parent  aa85a5ab27553ba5a63883a732b34656a16bce44
 Bug 1611647 - Port bug 1579952 - Fix references to xul files in suite.
 
 diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
@@ -1270,7 +1270,7 @@ diff --git a/suite/chatzilla/xul/content/chatzillaOverlay.js b/suite/chatzilla/x
 diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/content/commands.js
 --- a/suite/chatzilla/xul/content/commands.js
 +++ b/suite/chatzilla/xul/content/commands.js
-@@ -1360,17 +1360,17 @@ function cmdNetworks(e)
+@@ -1335,17 +1335,17 @@ function cmdNetworks(e)
  
      wrapper.appendChild(spanb);
      display(wrapper, MT_INFO);
@@ -1289,7 +1289,7 @@ diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/conte
      let scheme = (e.command.name == "sslserver") ? "ircs" : "irc";
  
      var ary = e.hostname.match(/^(.*):(\d+)$/);
-@@ -1387,17 +1387,17 @@ function cmdServer(e)
+@@ -1362,17 +1362,17 @@ function cmdServer(e)
  }
  
  function cmdSSLException(e)
@@ -1308,7 +1308,7 @@ diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/conte
      if (e.connect)
      {
          // When we come via the inline button, we just want to reconnect
-@@ -2298,17 +2298,17 @@ function cmdJoin(e)
+@@ -2273,17 +2273,17 @@ function cmdJoin(e)
      {
          if (client.joinDialog)
          {
@@ -1327,7 +1327,7 @@ diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/conte
  
      var chan;
      if (!e.channelToJoin)
-@@ -2684,17 +2684,17 @@ function cmdTopic(e)
+@@ -2626,17 +2626,17 @@ function cmdTopic(e)
  
  function cmdAbout(e)
  {
@@ -1346,7 +1346,7 @@ diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/conte
          client.munger.getRule(".inline-buttons").enabled = true;
          display(getMsg(MSG_ABOUT_VERSION, [ver, "about"]));
          display(MSG_ABOUT_HOMEPAGE);
-@@ -3755,17 +3755,17 @@ function cmdDoCommand(e)
+@@ -3697,17 +3697,17 @@ function cmdDoCommand(e)
          // Open SeaMonkey preferences.
          goPreferences("navigator_pane");
      }
@@ -1365,7 +1365,7 @@ diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/conte
          }
      }
      else if (e.cmdName == "cmd_selectAll")
-@@ -4455,17 +4455,17 @@ function cmdInputTextDirection(e)
+@@ -4397,17 +4397,17 @@ function cmdInputTextDirection(e)
              client.input.setAttribute("dir", "ltr");
      }