diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | embed/mozilla/FilePicker.cpp | 5 |
2 files changed, 11 insertions, 1 deletions
@@ -1,6 +1,13 @@ +2004-06-07 Christian Persch <chpe@cvs.gnome.org> + + * embed/mozilla/FilePicker.cpp: + + Don't allow ::SetDefaultString unless we're in modeSave. + 2004-06-07 Ross Burton <ross@burtonini.com> * src/ephy-shell.c: + Load extensions from ~/.gnome2/epiphany/extensions as well. 2004-06-07 Christian Persch <chpe@cvs.gnome.org> diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp index 023cb12d2..816eadee5 100644 --- a/embed/mozilla/FilePicker.cpp +++ b/embed/mozilla/FilePicker.cpp @@ -272,7 +272,7 @@ NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar *aDefaultString) { NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE); - if (!mMode == nsIFilePicker::modeSave) return NS_ERROR_FAILURE; + if (mMode != nsIFilePicker::modeSave) return NS_ERROR_FAILURE; #if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1) if (aDefaultString.Length()) @@ -288,6 +288,9 @@ NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar *aDefaultString) NS_UTF16ToCString (nsEmbedString(aDefaultString), NS_CSTRING_ENCODING_UTF8, defaultString); #endif + + LOG ("GFilePicker::SetDefaultString %s", defaultString.get()) + /* set_current_name takes UTF-8, not a filename */ gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (mDialog), defaultString.get()); |