AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

filechooserentry: Simplify model construction

Browse Source 
Don't pass a get_value callback when creating the
filesystem model. It isn't called anymore, and things
continue to work.
This commit is contained in:
Matthias Clasen 2022-10-12 07:44:45 -04:00
parent c19d0dc9ea
commit 278bcf2680
1 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gtk/gtkfilechooserentry.c
View File

@ -553,45 +553,6 @@ discard_completion_store (GtkFileChooserEntry *chooser_entry)
g_clear_object (&chooser_entry->model); g_clear_object (&chooser_entry->model);
} }
static gboolean
completion_store_set (GtkFileSystemModel *model,
GFile *file,
GFileInfo *info,
int column,
GValue *value,
gpointer data)
{
GtkFileChooserEntry *chooser_entry = data;
const char *prefix = "";
const char *suffix = "";
switch (column)
{
case FILE_INFO_COLUMN:
g_value_set_object (value, info);
break;
case FULL_PATH_COLUMN:
prefix = chooser_entry->dir_part;
G_GNUC_FALLTHROUGH;
case DISPLAY_NAME_COLUMN:
if (_gtk_file_info_consider_as_directory (info))
suffix = G_DIR_SEPARATOR_S;
g_value_take_string (value,
g_strconcat (prefix,
g_file_info_get_display_name (info),
suffix,
NULL));
break;
default:
g_assert_not_reached ();
break;
}
return TRUE;
}
static void static void
model_items_changed_cb (GListModel *model, model_items_changed_cb (GListModel *model,
guint position, guint position,
@ -656,8 +617,8 @@ populate_completion_store (GtkFileChooserEntry *chooser_entry)
_gtk_file_system_model_new_for_directory (chooser_entry->current_folder_file, _gtk_file_system_model_new_for_directory (chooser_entry->current_folder_file,
"standard::name,standard::display-name,standard::type," "standard::name,standard::display-name,standard::type,"
"standard::content-type", "standard::content-type",
completion_store_set, NULL,
chooser_entry, NULL,
N_COLUMNS, N_COLUMNS,
G_TYPE_FILE_INFO, G_TYPE_FILE_INFO,
G_TYPE_STRING, G_TYPE_STRING,