# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1316600321 -7200
# Node ID 1c2c7f8923f1232ffcc8a7f480e9c072db7bfc7f
# Parent  0103840bc431454e4d54af13bd002ddc71c4026f
update to 1.9.2.23/3.6.23
sync dialog.xml in mozilla-kde.patch

diff -r 0103840bc431 -r 1c2c7f8923f1 mozilla-kde.patch
--- a/mozilla-kde.patch	Wed Sep 14 09:11:27 2011 +0200
+++ b/mozilla-kde.patch	Wed Sep 21 12:18:41 2011 +0200
@@ -634,7 +634,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/dialog-kde.xml
-@@ -0,0 +1,445 @@
+@@ -0,0 +1,447 @@
 +<?xml version="1.0"?>
 +
 +<bindings id="dialogBindings"
@@ -808,27 +808,29 @@
 +              document.commandDispatcher.advanceFocusIntoSubtree(dialog);
 +
 +              var focusedElt = document.commandDispatcher.focusedElement;
-+              var initialFocusedElt = focusedElt;
-+              while (focusedElt.localName == "tab" ||
-+                     focusedElt.getAttribute("noinitialfocus") == "true") {
-+                document.commandDispatcher.advanceFocusIntoSubtree(focusedElt);
-+                focusedElt = document.commandDispatcher.focusedElement;
-+                if (focusedElt == initialFocusedElt)
-+                  break;
-+              }
++              if (focusedElt) {
++                var initialFocusedElt = focusedElt;
++                while (focusedElt.localName == "tab" ||
++                       focusedElt.getAttribute("noinitialfocus") == "true") {
++                  document.commandDispatcher.advanceFocusIntoSubtree(focusedElt);
++                  focusedElt = document.commandDispatcher.focusedElement;
++                  if (focusedElt == initialFocusedElt)
++                    break;
++                }
 +
-+              if (initialFocusedElt.localName == "tab") {
-+                if (focusedElt.hasAttribute("dlgtype")) {
-+                  // We don't want to focus on anonymous OK, Cancel, etc. buttons,
-+                  // so return focus to the tab itself
-+                  initialFocusedElt.focus();
++                if (initialFocusedElt.localName == "tab") {
++                  if (focusedElt.hasAttribute("dlgtype")) {
++                    // We don't want to focus on anonymous OK, Cancel, etc. buttons,
++                    // so return focus to the tab itself
++                    initialFocusedElt.focus();
++                  }
 +                }
++#ifndef XP_MACOSX
++                else if (focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) {
++                  defaultButton.focus();
++                }
++#endif
 +              }
-+#ifndef XP_MACOSX
-+              else if (focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) {
-+                defaultButton.focus();
-+              }
-+#endif
 +            }
 +
 +            try {
@@ -3982,7 +3984,7 @@
  #include <hildon-mime.h>
  #include <libosso.h>
  #endif
-@@ -1627,36 +1628,46 @@ nsLocalFile::Launch()
+@@ -1666,36 +1667,46 @@ nsLocalFile::Launch()
  
      return NS_OK;
  }
@@ -4035,7 +4037,7 @@
  NS_IMETHODIMP
  nsLocalFile::Launch()
  {
-@@ -1674,16 +1685,23 @@ nsLocalFile::Launch()
+@@ -1713,16 +1724,23 @@ nsLocalFile::Launch()
  
      if (nsnull == connection)
        return NS_ERROR_FAILURE;
diff -r 0103840bc431 -r 1c2c7f8923f1 mozilla-xulrunner192/create-tar.sh
--- a/mozilla-xulrunner192/create-tar.sh	Wed Sep 14 09:11:27 2011 +0200
+++ b/mozilla-xulrunner192/create-tar.sh	Wed Sep 21 12:18:41 2011 +0200
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-RELEASE_TAG="FIREFOX_3_6_22_RELEASE"
-VERSION="1.9.2.22"
+RELEASE_TAG="FIREFOX_3_6_23_RELEASE"
+VERSION="1.9.2.23"
 
 # mozilla
 hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla
diff -r 0103840bc431 -r 1c2c7f8923f1 mozilla-xulrunner192/mozilla-xulrunner192.changes
--- a/mozilla-xulrunner192/mozilla-xulrunner192.changes	Wed Sep 14 09:11:27 2011 +0200
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.changes	Wed Sep 21 12:18:41 2011 +0200
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep 21 10:17:09 UTC 2011 - wr@rosenauer.org
+
+- security update to 1.9.2.23
+- bring KDE's dialog.xml in sync with original widget
+
 -------------------------------------------------------------------
 Wed Sep 14 07:08:55 UTC 2011 - wr@rosenauer.org
 
diff -r 0103840bc431 -r 1c2c7f8923f1 mozilla-xulrunner192/mozilla-xulrunner192.spec
--- a/mozilla-xulrunner192/mozilla-xulrunner192.spec	Wed Sep 14 09:11:27 2011 +0200
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.spec	Wed Sep 21 12:18:41 2011 +0200
@@ -39,12 +39,12 @@
 BuildRequires:  wireless-tools
 %endif
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
-Version:        1.9.2.22
+Version:        1.9.2.23
 Release:        1
-%define         releasedate 2011090700
-%define         version_internal 1.9.2.22
+%define         releasedate 2011092000
+%define         version_internal 1.9.2.23
 %define         apiversion 1.9.2
-%define         uaweight 192220
+%define         uaweight 192230
 Summary:        Mozilla Runtime Environment 1.9.2
 Url:            http://www.mozilla.org
 Group:          Productivity/Other