equal
deleted
inserted
replaced
2614 |
2614 |
2615 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp |
2615 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp |
2616 new file mode 100644 |
2616 new file mode 100644 |
2617 --- /dev/null |
2617 --- /dev/null |
2618 +++ b/toolkit/xre/nsKDEUtils.cpp |
2618 +++ b/toolkit/xre/nsKDEUtils.cpp |
2619 @@ -0,0 +1,334 @@ |
2619 @@ -0,0 +1,328 @@ |
2620 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ |
2620 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ |
2621 +/* ***** BEGIN LICENSE BLOCK ***** |
2621 +/* ***** BEGIN LICENSE BLOCK ***** |
2622 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
2622 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
2623 + * |
2623 + * |
2624 + * The contents of this file are subject to the Mozilla Public License Version |
2624 + * The contents of this file are subject to the Mozilla Public License Version |
2814 + |
2814 + |
2815 +bool nsKDEUtils::internalCommand( const nsCStringArray& command, const GtkWindow* parent, bool blockUi, |
2815 +bool nsKDEUtils::internalCommand( const nsCStringArray& command, const GtkWindow* parent, bool blockUi, |
2816 + nsCStringArray* output ) |
2816 + nsCStringArray* output ) |
2817 + { |
2817 + { |
2818 + if( !startHelper()) |
2818 + if( !startHelper()) |
2819 + return false; |
|
2820 + // if Gtk has meanwhile gotten a grab (bnc#555202, somehow the file dialog |
|
2821 + // is called with a delay), then do not do anything, as this app would keep |
|
2822 + // the grabs but block waiting for the helper, which would be unable to do |
|
2823 + // anything because of the grab |
|
2824 + if( blockUi && gdk_pointer_is_grabbed()) |
|
2825 + return false; |
2819 + return false; |
2826 + feedCommand( command ); |
2820 + feedCommand( command ); |
2827 + // do not store the data in 'this' but in extra structure, just in case there |
2821 + // do not store the data in 'this' but in extra structure, just in case there |
2828 + // is reentrancy (can there be? the event loop is re-entered) |
2822 + // is reentrancy (can there be? the event loop is re-entered) |
2829 + nsKDECommandData data; |
2823 + nsKDECommandData data; |