aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-01-20 08:19:13 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-01-20 08:19:13 +0800
commit5f2bf6e7fe67481c000fe9671a679feef79a2fcf (patch)
tree5b8407b11a0f143ff0289e509abc27f97cbac16e /embed/mozilla
parent29e1844f7711f8bcfb5f7c561c6368d6240a6c9b (diff)
downloadgsoc2013-epiphany-5f2bf6e7fe67481c000fe9671a679feef79a2fcf.tar
gsoc2013-epiphany-5f2bf6e7fe67481c000fe9671a679feef79a2fcf.tar.gz
gsoc2013-epiphany-5f2bf6e7fe67481c000fe9671a679feef79a2fcf.tar.bz2
gsoc2013-epiphany-5f2bf6e7fe67481c000fe9671a679feef79a2fcf.tar.lz
gsoc2013-epiphany-5f2bf6e7fe67481c000fe9671a679feef79a2fcf.tar.xz
gsoc2013-epiphany-5f2bf6e7fe67481c000fe9671a679feef79a2fcf.tar.zst
gsoc2013-epiphany-5f2bf6e7fe67481c000fe9671a679feef79a2fcf.zip
Port several leaks fixes from galeon.
2003-01-20 Marco Pesenti Gritti <marco@it.gnome.org> * embed/ephy-embed-event.c: (free_g_value), (ephy_embed_event_init), (ephy_embed_event_get_property): * embed/ephy-embed-event.h: * embed/ephy-embed-popup.c: (setup_document_menu), (embed_popup_copy_email_cmd), (embed_popup_copy_link_location_cmd), (save_property_url), (embed_popup_open_link_cmd), (embed_popup_set_image_as_background_cmd), (embed_popup_copy_image_location_cmd), (embed_popup_open_image_cmd): * embed/ephy-embed-utils.c: (build_charset), (ephy_embed_utils_build_charsets_submenu): * embed/mozilla/FilePicker.cpp: * src/bookmarks/ephy-bookmarks.c: (update_favorites_menus): * src/ephy-nautilus-view.c: (gnv_embed_dom_mouse_down_cb), (gnv_popup_cmd_new_window), (gnv_popup_cmd_image_in_new_window): * src/ephy-shell.c: (ephy_shell_get_active_window): * src/ephy-tab.c: (ephy_tab_dom_mouse_down_cb): * src/ephy-window.c: (update_window_visibility), (update_spinner_control): * src/general-prefs.c: (language_dialog_changed_cb): * src/popup-commands.c: (popup_cmd_new_window), (popup_cmd_new_tab), (popup_cmd_image_in_new_tab), (popup_cmd_image_in_new_window), (popup_cmd_add_bookmark): * src/session.c: (session_close), (session_save): * src/session.h: Port several leaks fixes from galeon.
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/FilePicker.cpp22
1 files changed, 16 insertions, 6 deletions
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index 424bc8910..e488a8a6f 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -339,21 +339,29 @@ NS_METHOD GFilePicker::InitWithGtkWidget (GtkWidget *aParentWidget,
NS_METHOD GFilePicker::SanityCheck (PRBool *retIsSane)
{
*retIsSane = PR_TRUE;
-
+
+ nsresult rv;
PRBool dirExists, fileExists = PR_TRUE;
if (mDisplayDirectory)
{
- mDisplayDirectory->Exists (&dirExists);
+ rv = mDisplayDirectory->Exists (&dirExists);
+ g_return_val_if_fail (NS_SUCCEEDED(rv), rv);
}
else
{
dirExists = PR_FALSE;
}
- if (mMode == nsIFilePicker::modeOpen)
+ if (mMode != nsIFilePicker::modeGetFolder)
{
- mFile->Exists (&fileExists);
+ rv = mFile->Exists (&fileExists);
+ g_return_val_if_fail (NS_SUCCEEDED(rv), rv);
+ }
+
+ if (mMode == nsIFilePicker::modeSave && !fileExists)
+ {
+ return NS_OK;
}
if (!dirExists || !fileExists)
@@ -380,13 +388,15 @@ NS_METHOD GFilePicker::SanityCheck (PRBool *retIsSane)
char *errorText;
if (mMode == nsIFilePicker::modeGetFolder)
{
- mDisplayDirectory->IsDirectory (&correctType);
+ rv = mDisplayDirectory->IsDirectory (&correctType);
+ g_return_val_if_fail (NS_SUCCEEDED(rv), rv);
errorText = g_strdup (_("A file was selected when a "
"folder was expected."));
}
else
{
- mFile->IsFile (&correctType);
+ rv = mFile->IsFile (&correctType);
+ g_return_val_if_fail (NS_SUCCEEDED(rv), rv);
errorText = g_strdup (_("A folder was selected when a "
"file was expected."));
}