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

filedialog: Robustness fixes

Browse Source 
This code was not working well.
This commit is contained in:
Matthias Clasen 2023-02-06 22:14:43 +01:00
parent f83cab01ec
commit f8321029fc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkfiledialog.c
View File

@ -694,7 +694,7 @@ gtk_file_dialog_set_initial_file (GtkFileDialog *self,
GFile *folder; GFile *folder;
GFileInfo *info; GFileInfo *info;
if (g_file_equal (self->initial_file, file)) if (self->initial_file && g_file_equal (self->initial_file, file))
return; return;
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_INITIAL_FILE]); g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_INITIAL_FILE]);
@ -707,7 +707,7 @@ gtk_file_dialog_set_initial_file (GtkFileDialog *self,
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_INITIAL_FOLDER]); g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_INITIAL_FOLDER]);
info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME, 0, NULL, NULL); info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME, 0, NULL, NULL);
if (g_file_info_get_edit_name (info) != NULL) if (info && g_file_info_get_edit_name (info) != NULL)
{ {
if (g_set_str (&self->initial_name, g_file_info_get_edit_name (info))) if (g_set_str (&self->initial_name, g_file_info_get_edit_name (info)))
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_INITIAL_NAME]); g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_INITIAL_NAME]);
@ -724,7 +724,7 @@ gtk_file_dialog_set_initial_file (GtkFileDialog *self,
g_free (name); g_free (name);
g_free (relative); g_free (relative);
} }
g_object_unref (info); g_clear_object (&info);
g_object_unref (folder); g_object_unref (folder);
} }
else else