# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1359279746 -3600
# Node ID d2bfc69375aaae79a1394de90c1f6b1e367b07f3
# Parent  dfcb6d8fcf5ac9af46390ea998b28fec39added2
19.0b3
- updated KDE patches

diff -r dfcb6d8fcf5a -r d2bfc69375aa MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Wed Jan 16 23:10:38 2013 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Sun Jan 27 10:42:26 2013 +0100
@@ -4,6 +4,7 @@
 - update to Firefox 18.0.1
   * blocklist updates
   * backed out bmo#677092 (removed patch)
+  * fixed problems involving HTTP proxy transactions
 
 -------------------------------------------------------------------
 Sat Jan 12 17:25:11 UTC 2013 - schwab@linux-m68k.org
diff -r dfcb6d8fcf5a -r d2bfc69375aa MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Jan 16 23:10:38 2013 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Sun Jan 27 10:42:26 2013 +0100
@@ -2,7 +2,7 @@
 # spec file for package MozillaFirefox
 #
 # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#               2006-2012 Wolfgang Rosenauer
+#               2006-2013 Wolfgang Rosenauer
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -54,7 +54,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2013011600
+%define         releasedate 2013012400
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
diff -r dfcb6d8fcf5a -r d2bfc69375aa MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Wed Jan 16 23:10:38 2013 +0100
+++ b/MozillaFirefox/create-tar.sh	Sun Jan 27 10:42:26 2013 +0100
@@ -2,7 +2,7 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_19_0b1_RELEASE"
+RELEASE_TAG="FIREFOX_19_0b3_RELEASE"
 VERSION="18.99"
 
 # mozilla
diff -r dfcb6d8fcf5a -r d2bfc69375aa firefox-kde.patch
--- a/firefox-kde.patch	Wed Jan 16 23:10:38 2013 +0100
+++ b/firefox-kde.patch	Sun Jan 27 10:42:26 2013 +0100
@@ -1614,7 +1614,7 @@
 +
 +    cmdstr->SetData( NS_LITERAL_CSTRING( "RUN" ));
 +    command->AppendElement( cmdstr, false );
-+    nsCAutoString app;
++    nsAutoCString app;
 +    nsresult rv = aApplication->GetNativePath( app );
 +    NS_ENSURE_SUCCESS( rv, rv );
 +    appstr->SetData( app );
@@ -1653,7 +1653,7 @@
 +    if( !resstr )
 +        return NS_ERROR_FAILURE;
 +
-+    nsCAutoString path;
++    nsAutoCString path;
 +    resstr->GetData( path );
 +    if (path.IsEmpty())
 +        return NS_ERROR_FAILURE;
diff -r dfcb6d8fcf5a -r d2bfc69375aa mozilla-kde.patch
--- a/mozilla-kde.patch	Wed Jan 16 23:10:38 2013 +0100
+++ b/mozilla-kde.patch	Sun Jan 27 10:42:26 2013 +0100
@@ -2187,7 +2187,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/xre/nsKDEUtils.cpp
-@@ -0,0 +1,341 @@
+@@ -0,0 +1,339 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -2353,8 +2353,6 @@
 +
 +bool nsKDEUtils::command( nsIArray* command, nsIArray** output)
 +    {
-+    NS_ENSURE_ARG( command );
-+
 +    nsTArray<nsCString> in;
 +    PRUint32 length;
 +    command->GetLength( &length );
@@ -3168,7 +3166,7 @@
 +
 +static PRInt32 windowToXid( nsIWidget* widget )
 +    {
-+    GtkWindow *parent_widget = get_gtk_window_for_nsiwidget( widget );
++    GtkWindow *parent_widget = GTK_WINDOW(widget->GetNativeData(NS_NATIVE_SHELLWIDGET));
 +    GdkWindow* gdk_window = gtk_widget_get_window( gtk_widget_get_toplevel( GTK_WIDGET( parent_widget )));
 +    return GDK_WINDOW_XID( gdk_window );
 +    }
@@ -3276,7 +3274,7 @@
 +        }
 +
 +    nsTArray<nsCString> output;
-+    if( nsKDEUtils::commandBlockUi( command, get_gtk_window_for_nsiwidget( mParentWidget ), &output ))
++    if( nsKDEUtils::commandBlockUi( command, GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)), &output ))
 +        {
 +        *aReturn = nsIFilePicker::returnOK;
 +        mFiles.Clear();
@@ -3364,7 +3362,7 @@
 +        }
 +
 +    nsTArray<nsCString> output;
-+    if( nsKDEUtils::commandBlockUi( command, get_gtk_window_for_nsiwidget( mParentWidget ), &output ))
++    if( nsKDEUtils::commandBlockUi( command, GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)), &output ))
 +        {
 +        *aReturn = nsIFilePicker::returnOK;
 +        mFileURL = output.Length() > 0 ? output[ 0 ] : nsCString();