From b3924f2a5509596645492d232c9b3dcf1ad35965 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 18 Feb 2008 13:40:59 +0000 Subject: Fix prompt service for xr 1.9 wrt. DOM notifications. Bug #504445. svn path=/trunk/; revision=7967 --- embed/mozilla/FilePicker.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'embed/mozilla/FilePicker.cpp') diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp index 90b041ef4..6850b8e34 100644 --- a/embed/mozilla/FilePicker.cpp +++ b/embed/mozilla/FilePicker.cpp @@ -46,8 +46,7 @@ #include "ephy-gui.h" #include "ephy-prefs.h" -#include "AutoJSContextStack.h" -#include "AutoWindowModalState.h" +#include "AutoModalDialog.h" #include "EphyUtils.h" #include "FilePicker.h" @@ -390,12 +389,12 @@ NS_IMETHODIMP GFilePicker::GetFiles(nsISimpleEnumerator * *aFiles) /* short show (); */ NS_IMETHODIMP GFilePicker::Show(PRInt16 *_retval) { - nsresult rv; - AutoJSContextStack stack; - rv = stack.Init (); - if (NS_FAILED (rv)) return rv; - - AutoWindowModalState modelState (mParent); + AutoModalDialog modalDialog (mParent, PR_FALSE); + if (!modalDialog.ShouldShow ()) { + *_retval = nsIFilePicker::returnCancel; + return NS_OK; + } + mParent = nsnull; LOG ("GFilePicker::Show"); @@ -425,7 +424,7 @@ NS_IMETHODIMP GFilePicker::Show(PRInt16 *_retval) do { - response = gtk_dialog_run (GTK_DIALOG (mDialog)); + response = modalDialog.Run (GTK_DIALOG (mDialog)); g_free (filename); filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (mDialog)); -- cgit v1.2.3