# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1451550450 -3600
# Node ID e1cfdb170c2f50d0c1dcddc968896dc46489e107
# Parent  571212dc4d0528ab7ab5feb685daf61eaf6c6332# Parent  86f72f1e98a4b1d603a597af0277b2a15cb13095
merge Gtk3 preparations into default branch

diff -r 571212dc4d05 -r e1cfdb170c2f MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Sat Dec 26 13:34:28 2015 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Thu Dec 31 09:27:30 2015 +0100
@@ -10,6 +10,7 @@
   * workaround Youtube user agent detection issue (bmo#1233970)
 - fix file download regression for multi user systems
   (bmo#1233434) (mozilla-bmo1233434.patch)
+- prepare mozilla-kde.patch for Gtk3
 
 -------------------------------------------------------------------
 Sun Dec 13 23:07:56 UTC 2015 - wr@rosenauer.org
diff -r 571212dc4d05 -r e1cfdb170c2f MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Sat Dec 26 13:34:28 2015 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Dec 31 09:27:30 2015 +0100
@@ -321,6 +321,9 @@
 ac_add_options --mandir=%{_mandir}
 ac_add_options --includedir=%{_includedir}
 ac_add_options --enable-release
+%if 0%{?suse_version} > 1320
+#ac_add_options --enable-default-toolkit=cairo-gtk3
+%endif
 %ifarch %ix86 %arm
 %if 0%{?suse_version} > 1230
 ac_add_options --disable-optimize
@@ -569,6 +572,10 @@
 %{progdir}/components/
 %{progdir}/defaults/
 %{progdir}/dictionaries/
+%if 0%{?suse_version} > 1320
+#%dir %{progdir}/gtk2
+%{progdir}/gtk2/libmozgtk.so
+%endif
 %{progdir}/webapprt/
 %{progdir}/gmp-clearkey/
 %attr(755,root,root) %{progdir}/%{progname}.sh
diff -r 571212dc4d05 -r e1cfdb170c2f mozilla-kde.patch
--- a/mozilla-kde.patch	Sat Dec 26 13:34:28 2015 +0100
+++ b/mozilla-kde.patch	Thu Dec 31 09:27:30 2015 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  1e6ab61ae64f601da61197f34ad145f54a400b1f
+# Parent  fc87d8519207c57c22fb5a01243722be530679fa
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -2503,12 +2503,12 @@
 +    }
 +
 +
-+bool nsKDEUtils::commandBlockUi( const nsTArray<nsCString>& command, const GtkWindow* parent, nsTArray<nsCString>* output )
++bool nsKDEUtils::commandBlockUi( const nsTArray<nsCString>& command, GtkWindow* parent, nsTArray<nsCString>* output )
 +    {
 +    return self()->internalCommand( command, parent, true, output );
 +    }
 +
-+bool nsKDEUtils::internalCommand( const nsTArray<nsCString>& command, const GtkWindow* parent, bool blockUi,
++bool nsKDEUtils::internalCommand( const nsTArray<nsCString>& command, GtkWindow* parent, bool blockUi,
 +    nsTArray<nsCString>* 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<nsCString>& command, const GtkWindow* parent, nsTArray<nsCString>* output = NULL );
++        static bool commandBlockUi( const nsTArray<nsCString>& command, GtkWindow* parent, nsTArray<nsCString>* output = NULL );
 +
 +    private:
 +        nsKDEUtils();
@@ -2687,7 +2687,7 @@
 +        bool startHelper();
 +        void closeHelper();
 +        void feedCommand( const nsTArray<nsCString>& command );
-+        bool internalCommand( const nsTArray<nsCString>& command, const GtkWindow* parent, bool isParent,
++        bool internalCommand( const nsTArray<nsCString>& command, GtkWindow* parent, bool isParent,
 +            nsTArray<nsCString>* output );
 +        FILE* commandFile;
 +        FILE* replyFile;