diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-05-16 02:12:31 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-05-16 02:12:31 +0800 |
| commit | b88f8ce951f0a705dc9aaaaa2cf4c0a29dfa6e5c (patch) | |
| tree | dc02519b4e4c47ef64428b969f22fed28ef10656 /embed/mozilla/FilePicker.cpp | |
| parent | 7db75551c30471545fb68029082ef25ac84d2b08 (diff) | |
| download | gsoc2013-epiphany-b88f8ce951f0a705dc9aaaaa2cf4c0a29dfa6e5c.tar gsoc2013-epiphany-b88f8ce951f0a705dc9aaaaa2cf4c0a29dfa6e5c.tar.gz gsoc2013-epiphany-b88f8ce951f0a705dc9aaaaa2cf4c0a29dfa6e5c.tar.bz2 gsoc2013-epiphany-b88f8ce951f0a705dc9aaaaa2cf4c0a29dfa6e5c.tar.lz gsoc2013-epiphany-b88f8ce951f0a705dc9aaaaa2cf4c0a29dfa6e5c.tar.xz gsoc2013-epiphany-b88f8ce951f0a705dc9aaaaa2cf4c0a29dfa6e5c.tar.zst gsoc2013-epiphany-b88f8ce951f0a705dc9aaaaa2cf4c0a29dfa6e5c.zip | |
=== Release 2.15.2 ===RELEASE_2_15_2
2006-05-15 Christian Persch <chpe@cvs.gnome.org>
=== Release 2.15.2 ===
* NEWS:
2006-05-15 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/EphyHeaderSniffer.cpp:
* embed/mozilla/EphyUtils.cpp:
* embed/mozilla/FilePicker.cpp:
* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
* embed/mozilla/GtkNSSDialogs.cpp:
* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
* embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:
* embed/mozilla/MozDownload.cpp:
* embed/mozilla/mozilla-embed-persist.cpp:
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-notifiers.cpp:
* embed/mozilla/mozilla-x509-cert.cpp:
Some castings.
Diffstat (limited to 'embed/mozilla/FilePicker.cpp')
| -rw-r--r-- | embed/mozilla/FilePicker.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp index d3445919a..aff2249ce 100644 --- a/embed/mozilla/FilePicker.cpp +++ b/embed/mozilla/FilePicker.cpp @@ -146,7 +146,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) if (filterMask & nsIFilePicker::filterAll) { ephy_file_chooser_add_pattern_filter (mDialog, _("All files"), - "*", NULL); + "*", (char*) NULL); } if (filterMask & nsIFilePicker::filterHTML) { @@ -154,7 +154,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) "text/html", "application/xhtml+xml", "text/xml", - NULL); + (char *) NULL); } if (filterMask & nsIFilePicker::filterText) { @@ -167,17 +167,17 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask) "image/png", "image/jpeg", "image/gif", - NULL); + (char *) NULL); } if (filterMask & nsIFilePicker::filterXML) { ephy_file_chooser_add_pattern_filter (mDialog, _("XML files"), - "*.xml", NULL); + "*.xml", (char *) NULL); } if (filterMask & nsIFilePicker::filterXUL) { ephy_file_chooser_add_pattern_filter (mDialog, _("XUL files"), - "*.xul", NULL); + "*.xul", (char *) NULL); } return NS_OK; @@ -357,7 +357,7 @@ NS_IMETHODIMP GFilePicker::SetDisplayDirectory(nsILocalFile *aDisplayDirectory) NS_UTF16ToCString (mDefaultString, NS_CSTRING_ENCODING_NATIVE_FILESYSTEM, defaultString); - char *filename = g_build_filename (dir.get(), defaultString.get(), NULL); + char *filename = g_build_filename (dir.get(), defaultString.get(), (char *) NULL); LOG ("Setting filename to %s", filename); gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (mDialog), filename); g_free (filename); |