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 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 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 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();