Fix file picker warnings.

2003-06-15  Marco Pesenti Gritti  <marco@it.gnome.org>

	* embed/mozilla/FilePicker.cpp:
	* embed/mozilla/FilePicker.h:
	* lib/egg/eggtreemodelfilter.c:
	(egg_tree_model_filter_fetch_child),
	(egg_tree_model_filter_remove_node),
	(egg_tree_model_filter_row_changed),
	(egg_tree_model_filter_row_inserted),
	(egg_tree_model_filter_row_deleted),
	(egg_real_tree_model_filter_convert_child_path_to_path),
	(egg_tree_model_filter_refilter_helper):
	* src/window-commands.c: (window_cmd_file_open):

	Fix file picker warnings.

2

2 files changed, 30 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 296d50697..423152782 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2003-06-15  Marco Pesenti Gritti  <marco@it.gnome.org>
+
+	* embed/mozilla/FilePicker.cpp:
+	* embed/mozilla/FilePicker.h:
+	* lib/egg/eggtreemodelfilter.c:
+	(egg_tree_model_filter_fetch_child),
+	(egg_tree_model_filter_remove_node),
+	(egg_tree_model_filter_row_changed),
+	(egg_tree_model_filter_row_inserted),
+	(egg_tree_model_filter_row_deleted),
+	(egg_real_tree_model_filter_convert_child_path_to_path),
+	(egg_tree_model_filter_refilter_helper):
+	* src/window-commands.c: (window_cmd_file_open):
+
+	Fix file picker warnings.
+
 2003-06-15  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/mozilla/MozillaPrivate.cpp: (MozillaCollatePrintSettings):
diff --git a/src/window-commands.c b/src/window-commands.c
index 94e53474f..3ffc40582 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -347,26 +347,25 @@ window_cmd_file_open (EggAction *action,
                  dir, NULL, modeOpen,
                  &file, NULL, NULL);
 
-	if (result == G_OK)
+	uri = gnome_vfs_uri_new (file);
+	if (uri)
 	{
-                uri = gnome_vfs_uri_new (file);
-                if (uri)
-                {
+		retDir = gnome_vfs_uri_extract_dirname (uri);
 
-                        ephy_window_load_url(window, file);
+		/* set default open dir */
+		eel_gconf_set_string (CONF_STATE_OPEN_DIR,
+				      retDir);
 
-                        retDir = gnome_vfs_uri_extract_dirname (uri);
+		g_free (retDir);
+		gnome_vfs_uri_unref (uri);
 
-                        /* set default open dir */
-                        eel_gconf_set_string (CONF_STATE_OPEN_DIR,
-                                              retDir);
-
-                        g_free (retDir);
-                        gnome_vfs_uri_unref (uri);
-                }
-	        g_free (file);
-        }
+		if (result == G_OK)
+		{
+			ephy_window_load_url(window, file);
+	        }
+	}
 
+	g_free (file);
         g_free (dir);
 }