AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Work around some problems with the gnome-vfs backends which could lead to

Browse Source 
2005-08-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserdefault.c: Work around some problems
	with the gnome-vfs backends which could lead to crashes
	in the bookmark handling.  (#310270, Diego Gonzalez, patch
	by Michael Meeks)
This commit is contained in:
Matthias Clasen 2005-08-12 03:03:44 +00:00 committed by Matthias Clasen
parent f5d97f0457
commit 2b40fb4fd9
4 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-08-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c: Work around some problems
with the gnome-vfs backends which could lead to crashes
in the bookmark handling. (#310270, Diego Gonzalez, patch
by Michael Meeks)
2005-08-11 Kristian Rietveld <kris@gtk.org> 2005-08-11 Kristian Rietveld <kris@gtk.org>
Fix for #312924, by John Finlay. Fix for #312924, by John Finlay.

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
2005-08-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c: Work around some problems
with the gnome-vfs backends which could lead to crashes
in the bookmark handling. (#310270, Diego Gonzalez, patch
by Michael Meeks)
2005-08-11 Kristian Rietveld <kris@gtk.org> 2005-08-11 Kristian Rietveld <kris@gtk.org>
Fix for #312924, by John Finlay. Fix for #312924, by John Finlay.

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
2005-08-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c: Work around some problems
with the gnome-vfs backends which could lead to crashes
in the bookmark handling. (#310270, Diego Gonzalez, patch
by Michael Meeks)
2005-08-11 Kristian Rietveld <kris@gtk.org> 2005-08-11 Kristian Rietveld <kris@gtk.org>
Fix for #312924, by John Finlay. Fix for #312924, by John Finlay.

8
gtk/gtkfilechooserdefault.c
View File

@ -1075,6 +1075,8 @@ change_folder_and_display_error (GtkFileChooserDefault *impl,
gboolean result; gboolean result;
GtkFilePath *path_copy; GtkFilePath *path_copy;
g_return_val_if_fail (path != NULL, FALSE);
profile_start ("start", (char *) path); profile_start ("start", (char *) path);
/* We copy the path because of this case: /* We copy the path because of this case:
@ -2060,8 +2062,8 @@ shortcut_find_position (GtkFileChooserDefault *impl,
volume = col_data; volume = col_data;
base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume); base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
exists = strcmp (gtk_file_path_get_string (path), exists = base_path && strcmp (gtk_file_path_get_string (path),
gtk_file_path_get_string (base_path)) == 0; gtk_file_path_get_string (base_path)) == 0;
g_free (base_path); g_free (base_path);
if (exists) if (exists)
@ -2092,6 +2094,8 @@ shortcuts_add_bookmark_from_path (GtkFileChooserDefault *impl,
{ {
GError *error; GError *error;
g_return_val_if_fail (path != NULL, FALSE);
if (shortcut_find_position (impl, path) != -1) if (shortcut_find_position (impl, path) != -1)
return FALSE; return FALSE;