Merge lp:~debfx/firefox/firefox-trunk.head.kde into lp:firefox/trunk

[Felix Geyer]

Fix LP: #885836 - can't save files in KDE

I know that the patch is disabled in the trunk branch but I want to make sure that the bugfix doesn't regress again.

Unmerged revisions

1059. By Felix Geyer on 2011-11-30

Fix LP: #885836 - can't save files in KDE

=== modified file 'debian/patches/mozilla-kde.patch'
--- debian/patches/mozilla-kde.patch	2011-10-19 11:07:16 +0000
+++ debian/patches/mozilla-kde.patch	2011-11-30 11:22:33 +0000
@@ -206,7 +206,7 @@
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ mozilla/toolkit/xre/nsKDEUtils.cpp	2011-10-19 12:03:37.379620517 +0100
-@@ -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
@@ -407,12 +407,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)