[gtk: 2/3] GtkFileChooserWidget: return empty GListModel in get_files () instead of NULL
- From: Luca Bacci <lbacci src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 2/3] GtkFileChooserWidget: return empty GListModel in get_files () instead of NULL
- Date: Mon, 2 May 2022 18:53:28 +0000 (UTC)
commit 5a1396d38ee5c416f12fe593c29daee7db22d820
Author: Luca Bacci <luca bacci982 gmail com>
Date: Sun May 1 16:41:10 2022 +0200
GtkFileChooserWidget: return empty GListModel in get_files () instead of NULL
gtk/gtkfilechooserwidget.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 4c34c49840..34e34734d3 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -5466,7 +5466,7 @@ gtk_file_chooser_widget_get_files (GtkFileChooser *chooser)
goto out;
if (!is_well_formed)
- return NULL;
+ goto empty;
if (info.file_from_entry)
{
@@ -5476,7 +5476,7 @@ gtk_file_chooser_widget_get_files (GtkFileChooser *chooser)
else if (!file_list_seen)
goto file_list;
else
- return NULL;
+ goto empty;
}
else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
goto file_list;
@@ -5508,6 +5508,11 @@ gtk_file_chooser_widget_get_files (GtkFileChooser *chooser)
}
return G_LIST_MODEL (info.result);
+
+empty:
+
+ g_list_store_remove_all (info.result);
+ return G_LIST_MODEL (info.result);
}
/* Shows or hides the filter widgets */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]