forked from pool/MozillaThunderbird
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
Index: widget/src/gtk2/nsWidgetFactory.cpp
|
|
===================================================================
|
|
RCS file: /cvsroot/mozilla/widget/src/gtk2/nsWidgetFactory.cpp,v
|
|
retrieving revision 1.26.12.1
|
|
diff -u -p -6 -r1.26.12.1 nsWidgetFactory.cpp
|
|
--- widget/src/gtk2/nsWidgetFactory.cpp 21 Apr 2006 21:43:42 -0000 1.26.12.1
|
|
+++ widget/src/gtk2/nsWidgetFactory.cpp 25 Apr 2006 05:05:06 -0000
|
|
@@ -52,12 +52,13 @@
|
|
#include "nsBidiKeyboard.h"
|
|
#include "nsNativeKeyBindings.h"
|
|
|
|
#include "nsIComponentRegistrar.h"
|
|
#include "nsComponentManagerUtils.h"
|
|
#include "nsAutoPtr.h"
|
|
+#include "prenv.h"
|
|
#include <gtk/gtk.h>
|
|
|
|
/* from nsFilePicker.js */
|
|
#define XULFILEPICKER_CID \
|
|
{ 0x54ae32f8, 0x1dd2, 0x11b2, \
|
|
{ 0xa2, 0x09, 0xdf, 0x7c, 0x50, 0x53, 0x70, 0xf8} }
|
|
@@ -83,13 +84,13 @@ nsFilePickerConstructor(nsISupports *aOu
|
|
*aResult = nsnull;
|
|
if (aOuter != nsnull) {
|
|
return NS_ERROR_NO_AGGREGATION;
|
|
}
|
|
|
|
nsCOMPtr<nsIFilePicker> picker;
|
|
- if (gtk_check_version(2,6,3) == NULL) {
|
|
+ if ( (gtk_check_version(2,6,3) == NULL) && !PR_GetEnv("MOZ_XUL_PICKER") ) {
|
|
picker = new nsFilePicker;
|
|
} else {
|
|
picker = do_CreateInstance(kXULFilePickerCID);
|
|
}
|
|
|
|
if (!picker) {
|