fix 'save as' with KDE integration (bnc#557598)
authorllunak@novell.com
Mon, 28 Mar 2011 19:10:37 +0200
changeset 244 e78e26a38f6d
parent 241 d252ac91853e
child 245 930e17048499
fix 'save as' with KDE integration (bnc#557598)
mozilla-kde.patch
mozilla-xulrunner20/mozilla-xulrunner20.changes
--- a/mozilla-kde.patch	Sat Mar 19 23:22:13 2011 +0100
+++ b/mozilla-kde.patch	Mon Mar 28 19:10:37 2011 +0200
@@ -2158,7 +2158,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/xre/nsKDEUtils.cpp
-@@ -0,0 +1,334 @@
+@@ -0,0 +1,328 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -2359,12 +2359,6 @@
 +    {
 +    if( !startHelper())
 +        return false;
-+    // if Gtk has meanwhile gotten a grab (bnc#555202, somehow the file dialog
-+    // is called with a delay), then do not do anything, as this app would keep
-+    // the grabs but block waiting for the helper, which would be unable to do
-+    // anything because of the grab
-+    if( blockUi && gdk_pointer_is_grabbed())
-+        return false;
 +    feedCommand( command );
 +    // do not store the data in 'this' but in extra structure, just in case there
 +    // is reentrancy (can there be? the event loop is re-entered)
--- a/mozilla-xulrunner20/mozilla-xulrunner20.changes	Sat Mar 19 23:22:13 2011 +0100
+++ b/mozilla-xulrunner20/mozilla-xulrunner20.changes	Mon Mar 28 19:10:37 2011 +0200
@@ -1,7 +1,12 @@
+-------------------------------------------------------------------
+Mon Mar 28 16:25:25 UTC 2011 - llunak@novell.com
+
+- fix 'save as' with KDE integration (bnc#557598)
+
 -------------------------------------------------------------------
 Fri Mar 18 08:48:12 UTC 2011 - wr@rosenauer.org
 
-- update to 2.0rc2
+- update to 2.0 (rc2)
   * removed upstreamed mozilla-gio-launch-uri.patch
   * updated supported locale list
 - set useragent buildid to branded Firefox default