diff options
Diffstat (limited to 'embed/mozilla')
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 2 | ||||
| -rw-r--r-- | embed/mozilla/EphyHeaderSniffer.cpp | 2 | ||||
| -rw-r--r-- | embed/mozilla/FilePicker.cpp | 15 |
3 files changed, 9 insertions, 10 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index 5cd1bdbbe..a2dabda03 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -132,7 +132,7 @@ NS_IMETHODIMP GContentHandler::PromptForSaveToFile( NS_ConvertUTF16toUTF8 (aDefaultFile).get()); response = gtk_dialog_run (GTK_DIALOG (dialog)); - if (response == EPHY_RESPONSE_SAVE) + if (response == GTK_RESPONSE_ACCEPT) { filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp index 28bbf7e22..1a14fe962 100644 --- a/embed/mozilla/EphyHeaderSniffer.cpp +++ b/embed/mozilla/EphyHeaderSniffer.cpp @@ -197,7 +197,7 @@ EphyHeaderSniffer::OnSecurityChange (nsIWebProgress *aWebProgress, nsIRequest *a static void filechooser_response_cb (EphyFileChooser *dialog, gint response, EphyHeaderSniffer* sniffer) { - if (response == EPHY_RESPONSE_SAVE) + if (response == GTK_RESPONSE_ACCEPT) { char *filename; GtkWidget *parent = NULL; // FIXME! diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp index a456be78f..39283c56e 100644 --- a/embed/mozilla/FilePicker.cpp +++ b/embed/mozilla/FilePicker.cpp @@ -110,9 +110,9 @@ NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, const PRUnichar *t gtk_dialog_add_buttons (GTK_DIALOG (mDialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, EPHY_RESPONSE_OPEN, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - gtk_dialog_set_default_response (GTK_DIALOG (mDialog), EPHY_RESPONSE_OPEN); + gtk_dialog_set_default_response (GTK_DIALOG (mDialog), GTK_RESPONSE_ACCEPT); break; case nsIFilePicker::modeOpenMultiple: @@ -124,9 +124,9 @@ NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, const PRUnichar *t gtk_dialog_add_buttons (GTK_DIALOG (mDialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, EPHY_RESPONSE_OPEN, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - gtk_dialog_set_default_response (GTK_DIALOG (mDialog), EPHY_RESPONSE_OPEN); + gtk_dialog_set_default_response (GTK_DIALOG (mDialog), GTK_RESPONSE_ACCEPT); break; @@ -136,9 +136,9 @@ NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, const PRUnichar *t gtk_dialog_add_buttons (GTK_DIALOG (mDialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, EPHY_RESPONSE_SAVE, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); - gtk_dialog_set_default_response (GTK_DIALOG (mDialog), EPHY_RESPONSE_SAVE); + gtk_dialog_set_default_response (GTK_DIALOG (mDialog), GTK_RESPONSE_ACCEPT); break; default: g_assert_not_reached (); @@ -385,8 +385,7 @@ NS_IMETHODIMP GFilePicker::Show(PRInt16 *_retval) switch (response) { - case EPHY_RESPONSE_OPEN: - case EPHY_RESPONSE_SAVE: + case GTK_RESPONSE_ACCEPT: *_retval = nsIFilePicker::returnOK; break; default: |