Don't crash on NULL path; don't crash on NULL error.

2004-03-14  Morten Welinder  <terra@gnome.org>

	* gtk/gtkfilechooserdefault.c (error_dialog): Don't crash on NULL
	path; don't crash on NULL error.
This commit is contained in:
Morten Welinder 2004-03-14 19:47:20 +00:00 committed by Morten Welinder
parent e8a4c8442d
commit df8b419ecf
6 changed files with 37 additions and 10 deletions

View File

@ -1,3 +1,8 @@
2004-03-14 Morten Welinder <terra@gnome.org>
* gtk/gtkfilechooserdefault.c (error_dialog): Don't crash on NULL
path; don't crash on NULL error.
2004-03-14 Hans Breuer <hans@breuer.org> 2004-03-14 Hans Breuer <hans@breuer.org>
gtk/gtkcombobox.c : prototype cell_view_sync_cells() before gtk/gtkcombobox.c : prototype cell_view_sync_cells() before

View File

@ -1,3 +1,8 @@
2004-03-14 Morten Welinder <terra@gnome.org>
* gtk/gtkfilechooserdefault.c (error_dialog): Don't crash on NULL
path; don't crash on NULL error.
2004-03-14 Hans Breuer <hans@breuer.org> 2004-03-14 Hans Breuer <hans@breuer.org>
gtk/gtkcombobox.c : prototype cell_view_sync_cells() before gtk/gtkcombobox.c : prototype cell_view_sync_cells() before

View File

@ -1,3 +1,8 @@
2004-03-14 Morten Welinder <terra@gnome.org>
* gtk/gtkfilechooserdefault.c (error_dialog): Don't crash on NULL
path; don't crash on NULL error.
2004-03-14 Hans Breuer <hans@breuer.org> 2004-03-14 Hans Breuer <hans@breuer.org>
gtk/gtkcombobox.c : prototype cell_view_sync_cells() before gtk/gtkcombobox.c : prototype cell_view_sync_cells() before

View File

@ -1,3 +1,8 @@
2004-03-14 Morten Welinder <terra@gnome.org>
* gtk/gtkfilechooserdefault.c (error_dialog): Don't crash on NULL
path; don't crash on NULL error.
2004-03-14 Hans Breuer <hans@breuer.org> 2004-03-14 Hans Breuer <hans@breuer.org>
gtk/gtkcombobox.c : prototype cell_view_sync_cells() before gtk/gtkcombobox.c : prototype cell_view_sync_cells() before

View File

@ -1,3 +1,8 @@
2004-03-14 Morten Welinder <terra@gnome.org>
* gtk/gtkfilechooserdefault.c (error_dialog): Don't crash on NULL
path; don't crash on NULL error.
2004-03-14 Hans Breuer <hans@breuer.org> 2004-03-14 Hans Breuer <hans@breuer.org>
gtk/gtkcombobox.c : prototype cell_view_sync_cells() before gtk/gtkcombobox.c : prototype cell_view_sync_cells() before

View File

@ -662,17 +662,19 @@ error_dialog (GtkFileChooserDefault *impl,
const GtkFilePath *path, const GtkFilePath *path,
GError *error) GError *error)
{ {
char *uri; g_return_if_fail (path != NULL);
char *text;
uri = gtk_file_system_path_to_uri (impl->file_system, path); if (error)
text = g_strdup_printf (msg, {
uri, char *uri = gtk_file_system_path_to_uri (impl->file_system, path);
error->message); text = g_strdup_printf (msg,
error_message (impl, text); uri,
g_free (text); error->message);
g_free (uri); error_message (impl, text);
g_error_free (error); g_free (text);
g_free (uri);
g_error_free (error);
}
} }
/* Displays an error message about not being able to get information for a file. /* Displays an error message about not being able to get information for a file.