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

file chooser: Avoid warnings from the location column

Browse Source 
Avoid criticals that would come out of this code if file is / or NULL.
This commit is contained in:
Matthias Clasen 2015-03-02 15:38:29 -05:00
parent 65b55938ca
commit d2fe45ab57
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkfilechooserwidget.c
View File

@ -4066,11 +4066,14 @@ file_system_model_set (GtkFileSystemModel *model,
gchar *location;
home_location = g_file_new_for_path (g_get_home_dir ());
dir_location = g_file_get_parent (file);
if (file)
dir_location = g_file_get_parent (file);
else
dir_location = NULL;
if (g_file_equal (home_location, dir_location))
if (dir_location && g_file_equal (home_location, dir_location))
location = g_strdup (_("Home"));
else if (g_file_has_prefix (dir_location, home_location))
else if (dir_location && g_file_has_prefix (dir_location, home_location))
{
gchar *relative_path;
@ -4084,7 +4087,8 @@ file_system_model_set (GtkFileSystemModel *model,
g_value_take_string (value, location);
g_object_unref (dir_location);
if (dir_location)
g_object_unref (dir_location);
g_object_unref (home_location);
}
break;