diff -r 571212dc4d05 -r 86f72f1e98a4 mozilla-kde.patch --- a/mozilla-kde.patch Sat Dec 26 13:34:28 2015 +0100 +++ b/mozilla-kde.patch Mon Dec 28 13:54:47 2015 +0100 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 1e6ab61ae64f601da61197f34ad145f54a400b1f +# Parent fc87d8519207c57c22fb5a01243722be530679fa Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer Author: Lubos Lunak @@ -2503,12 +2503,12 @@ + } + + -+bool nsKDEUtils::commandBlockUi( const nsTArray& command, const GtkWindow* parent, nsTArray* output ) ++bool nsKDEUtils::commandBlockUi( const nsTArray& command, GtkWindow* parent, nsTArray* output ) + { + return self()->internalCommand( command, parent, true, output ); + } + -+bool nsKDEUtils::internalCommand( const nsTArray& command, const GtkWindow* parent, bool blockUi, ++bool nsKDEUtils::internalCommand( const nsTArray& command, GtkWindow* parent, bool blockUi, + nsTArray* output ) + { + if( !startHelper()) @@ -2524,8 +2524,8 @@ + { + data.loop = g_main_loop_new( NULL, FALSE ); + GtkWidget* window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); -+ if( parent && parent->group ) -+ gtk_window_group_add_window( parent->group, GTK_WINDOW( window )); ++ if( parent && gtk_window_get_group(parent) ) ++ gtk_window_group_add_window( gtk_window_get_group(parent), GTK_WINDOW( window )); + gtk_widget_realize( window ); + gtk_widget_set_sensitive( window, TRUE ); + gtk_grab_add( window ); @@ -2678,7 +2678,7 @@ + /* Like command(), but additionally blocks the parent widget like if there was + a modal dialog shown and enters the event loop (i.e. there are still paint updates, + this is for commands that take long). */ -+ static bool commandBlockUi( const nsTArray& command, const GtkWindow* parent, nsTArray* output = NULL ); ++ static bool commandBlockUi( const nsTArray& command, GtkWindow* parent, nsTArray* output = NULL ); + + private: + nsKDEUtils(); @@ -2687,7 +2687,7 @@ + bool startHelper(); + void closeHelper(); + void feedCommand( const nsTArray& command ); -+ bool internalCommand( const nsTArray& command, const GtkWindow* parent, bool isParent, ++ bool internalCommand( const nsTArray& command, GtkWindow* parent, bool isParent, + nsTArray* output ); + FILE* commandFile; + FILE* replyFile;