aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fiv-browser.c70
-rw-r--r--fiv-io.c170
-rw-r--r--fiv-io.h20
-rw-r--r--fiv-sidebar.c4
-rw-r--r--fiv.c4
5 files changed, 146 insertions, 122 deletions
diff --git a/fiv-browser.c b/fiv-browser.c
index ccc070a..0c14c9b 100644
--- a/fiv-browser.c
+++ b/fiv-browser.c
@@ -108,14 +108,8 @@ static cairo_user_data_key_t fiv_browser_key_mtime_msec;
/// The original file size of source images for thumbnails.
static cairo_user_data_key_t fiv_browser_key_filesize;
-// TODO(p): Include FivIoModelEntry data by reference.
struct entry {
- gchar *uri; ///< GIO URI
- gchar *target_uri; ///< GIO URI for any target
- gchar *display_name; ///< Label for the file
- guint64 filesize; ///< Filesize in bytes
- gint64 mtime_msec; ///< Modification time in milliseconds
-
+ FivIoModelEntry *e; ///< Reference to model entry
cairo_surface_t *thumbnail; ///< Prescaled thumbnail
GIcon *icon; ///< If no thumbnail, use this icon
};
@@ -123,9 +117,7 @@ struct entry {
static void
entry_free(Entry *self)
{
- g_free(self->uri);
- g_free(self->target_uri);
- g_free(self->display_name);
+ fiv_io_model_entry_unref(self->e);
g_clear_pointer(&self->thumbnail, cairo_surface_destroy);
g_clear_object(&self->icon);
}
@@ -228,7 +220,8 @@ relayout(FivBrowser *self, int width)
PangoLayout *label = NULL;
if (self->show_labels) {
- label = gtk_widget_create_pango_layout(widget, entry->display_name);
+ label = gtk_widget_create_pango_layout(
+ widget, entry->e->display_name);
pango_layout_set_width(
label, (width - 2 * self->glow_w) * PANGO_SCALE);
pango_layout_set_alignment(label, PANGO_ALIGN_CENTER);
@@ -505,15 +498,15 @@ rescale_thumbnail(cairo_surface_t *thumbnail, double row_height)
return scaled;
}
-static char *
+static const char *
entry_system_wide_uri(const Entry *self)
{
// "recent" and "trash", e.g., also have "standard::target-uri" set,
// but we'd like to avoid saving their thumbnails.
- if (self->target_uri && fiv_collection_uri_matches(self->uri))
- return self->target_uri;
+ if (self->e->target_uri && fiv_collection_uri_matches(self->e->uri))
+ return self->e->target_uri;
- return self->uri;
+ return self->e->uri;
}
static void
@@ -522,10 +515,10 @@ entry_set_surface_user_data(const Entry *self)
// This choice of mtime favours unnecessary thumbnail reloading
// over retaining stale data (consider both calling functions).
cairo_surface_set_user_data(self->thumbnail,
- &fiv_browser_key_mtime_msec, (void *) (intptr_t) self->mtime_msec,
+ &fiv_browser_key_mtime_msec, (void *) (intptr_t) self->e->mtime_msec,
NULL);
cairo_surface_set_user_data(self->thumbnail,
- &fiv_browser_key_filesize, (void *) (uintptr_t) self->filesize,
+ &fiv_browser_key_filesize, (void *) (uintptr_t) self->e->filesize,
NULL);
}
@@ -538,19 +531,19 @@ entry_add_thumbnail(gpointer data, gpointer user_data)
FivBrowser *browser = FIV_BROWSER(user_data);
cairo_surface_t *cached =
- g_hash_table_lookup(browser->thumbnail_cache, self->uri);
+ g_hash_table_lookup(browser->thumbnail_cache, self->e->uri);
if (cached &&
(intptr_t) cairo_surface_get_user_data(cached,
- &fiv_browser_key_mtime_msec) == (intptr_t) self->mtime_msec &&
+ &fiv_browser_key_mtime_msec) == (intptr_t) self->e->mtime_msec &&
(uintptr_t) cairo_surface_get_user_data(cached,
- &fiv_browser_key_filesize) == (uintptr_t) self->filesize) {
+ &fiv_browser_key_filesize) == (uintptr_t) self->e->filesize) {
self->thumbnail = cairo_surface_reference(cached);
// TODO(p): If this hit is low-quality, see if a high-quality thumbnail
// hasn't been produced without our knowledge (avoid launching a minion
// unnecessarily; we might also shift the concern there).
} else {
cairo_surface_t *found = fiv_thumbnail_lookup(
- entry_system_wide_uri(self), self->mtime_msec, self->filesize,
+ entry_system_wide_uri(self), self->e->mtime_msec, self->e->filesize,
browser->item_size);
self->thumbnail = rescale_thumbnail(found, browser->item_height);
}
@@ -563,7 +556,7 @@ entry_add_thumbnail(gpointer data, gpointer user_data)
// Fall back to symbolic icons, though there's only so much we can do
// in parallel--GTK+ isn't thread-safe.
- GFile *file = g_file_new_for_uri(self->uri);
+ GFile *file = g_file_new_for_uri(self->e->uri);
GFileInfo *info = g_file_query_info(file,
G_FILE_ATTRIBUTE_STANDARD_NAME
"," G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON,
@@ -640,7 +633,7 @@ reload_thumbnails(FivBrowser *self)
for (guint i = 0; i < self->entries->len; i++) {
Entry *entry = &g_array_index(self->entries, Entry, i);
if (entry->thumbnail) {
- g_hash_table_insert(self->thumbnail_cache, g_strdup(entry->uri),
+ g_hash_table_insert(self->thumbnail_cache, g_strdup(entry->e->uri),
cairo_surface_reference(entry->thumbnail));
}
@@ -680,7 +673,7 @@ thumbnailer_reprocess_entry(FivBrowser *self, GBytes *output, Entry *entry)
}
entry_set_surface_user_data(entry);
- g_hash_table_insert(self->thumbnail_cache, g_strdup(entry->uri),
+ g_hash_table_insert(self->thumbnail_cache, g_strdup(entry->e->uri),
cairo_surface_reference(entry->thumbnail));
}
@@ -1128,7 +1121,7 @@ fiv_browser_draw(GtkWidget *widget, cairo_t *cr)
static gboolean
open_entry(GtkWidget *self, const Entry *entry, gboolean new_window)
{
- GFile *location = g_file_new_for_uri(entry->uri);
+ GFile *location = g_file_new_for_uri(entry->e->uri);
g_signal_emit(self, browser_signals[ITEM_ACTIVATED], 0, location,
new_window ? GTK_PLACES_OPEN_NEW_WINDOW : GTK_PLACES_OPEN_NORMAL);
g_object_unref(location);
@@ -1198,7 +1191,7 @@ fiv_browser_button_press_event(GtkWidget *widget, GdkEventButton *event)
// no matter what its new location is.
gdk_window_set_cursor(gtk_widget_get_window(widget), NULL);
- GFile *file = g_file_new_for_uri(entry->uri);
+ GFile *file = g_file_new_for_uri(entry->e->uri);
show_context_menu(widget, file);
g_object_unref(file);
return GDK_EVENT_STOP;
@@ -1342,8 +1335,8 @@ fiv_browser_drag_data_get(GtkWidget *widget,
{
FivBrowser *self = FIV_BROWSER(widget);
if (self->selected) {
- (void) gtk_selection_data_set_uris(
- data, (gchar *[]) {entry_system_wide_uri(self->selected), NULL});
+ (void) gtk_selection_data_set_uris(data, (gchar *[])
+ {(gchar *) entry_system_wide_uri(self->selected), NULL});
}
}
@@ -1520,7 +1513,7 @@ fiv_browser_key_press_event(GtkWidget *widget, GdkEventKey *event)
case GDK_KEY_Return:
if (self->selected) {
GtkWindow *window = GTK_WINDOW(gtk_widget_get_toplevel(widget));
- fiv_context_menu_information(window, self->selected->uri);
+ fiv_context_menu_information(window, self->selected->e->uri);
}
return GDK_EVENT_STOP;
}
@@ -1555,7 +1548,7 @@ fiv_browser_query_tooltip(GtkWidget *widget, gint x, gint y,
if (!entry)
return FALSE;
- gtk_tooltip_set_text(tooltip, entry->display_name);
+ gtk_tooltip_set_text(tooltip, entry->e->display_name);
return TRUE;
}
@@ -1569,7 +1562,7 @@ fiv_browser_popup_menu(GtkWidget *widget)
GFile *file = NULL;
GdkRectangle rect = {};
if (self->selected) {
- file = g_file_new_for_uri(self->selected->uri);
+ file = g_file_new_for_uri(self->selected->e->uri);
rect = entry_rect(self, self->selected);
rect.x += rect.width / 2;
rect.y += rect.height / 2;
@@ -1607,7 +1600,7 @@ on_long_press(GtkGestureLongPress *lp, gdouble x, gdouble y, gpointer user_data)
// It might also be possible to have long-press just select items,
// and show some kind of toolbar with available actions.
- GFile *file = g_file_new_for_uri(entry->uri);
+ GFile *file = g_file_new_for_uri(entry->e->uri);
gtk_menu_popup_at_rect(fiv_context_menu_new(widget, file), window,
&(GdkRectangle) {.x = x, .y = y}, GDK_GRAVITY_NORTH_WEST,
GDK_GRAVITY_NORTH_WEST, event);
@@ -1823,21 +1816,16 @@ on_model_files_changed(FivIoModel *model, FivBrowser *self)
gchar *selected_uri = NULL;
if (self->selected)
- selected_uri = g_strdup(self->selected->uri);
+ selected_uri = g_strdup(self->selected->e->uri);
thumbnailers_abort(self);
g_array_set_size(self->entries, 0);
g_array_set_size(self->layouted_rows, 0);
gsize len = 0;
- const FivIoModelEntry *files = fiv_io_model_get_files(self->model, &len);
+ FivIoModelEntry *const *files = fiv_io_model_get_files(self->model, &len);
for (gsize i = 0; i < len; i++) {
- Entry e = {.thumbnail = NULL,
- .uri = g_strdup(files[i].uri),
- .target_uri = g_strdup(files[i].target_uri),
- .display_name = g_strdup(files[i].display_name),
- .filesize = files[i].filesize,
- .mtime_msec = files[i].mtime_msec};
+ Entry e = {.e = fiv_io_model_entry_ref(files[i])};
g_array_append_val(self->entries, e);
}
@@ -1888,7 +1876,7 @@ fiv_browser_select(FivBrowser *self, const char *uri)
for (guint i = 0; i < self->entries->len; i++) {
const Entry *entry = &g_array_index(self->entries, Entry, i);
- if (!g_strcmp0(entry->uri, uri)) {
+ if (!g_strcmp0(entry->e->uri, uri)) {
self->selected = entry;
scroll_to_selection(self);
break;
diff --git a/fiv-io.c b/fiv-io.c
index 87a4e01..c4914a2 100644
--- a/fiv-io.c
+++ b/fiv-io.c
@@ -3044,21 +3044,10 @@ fiv_io_serialize_for_search(cairo_surface_t *surface, GError **error)
#include "xdg.h"
-static void
-model_entry_finalize(FivIoModelEntry *entry)
-{
- g_free(entry->uri);
- g_free(entry->target_uri);
- g_free(entry->display_name);
- g_free(entry->collate_key);
-}
-
-static GArray *
+static GPtrArray *
model_entry_array_new(void)
{
- GArray *a = g_array_new(FALSE, TRUE, sizeof(FivIoModelEntry));
- g_array_set_clear_func(a, (GDestroyNotify) model_entry_finalize);
- return a;
+ return g_ptr_array_new_with_free_func(g_rc_box_release);
}
struct _FivIoModel {
@@ -3067,8 +3056,8 @@ struct _FivIoModel {
GFile *directory; ///< Currently loaded directory
GFileMonitor *monitor; ///< "directory" monitoring
- GArray *subdirs; ///< "directory" contents
- GArray *files; ///< "directory" contents
+ GPtrArray *subdirs; ///< "directory" contents
+ GPtrArray *files; ///< "directory" contents
FivIoModelSort sort_field; ///< How to sort
gboolean sort_descending; ///< Whether to sort in reverse
@@ -3150,8 +3139,8 @@ model_compare_entries(FivIoModel *self,
static gint
model_compare(gconstpointer a, gconstpointer b, gpointer user_data)
{
- const FivIoModelEntry *entry1 = a;
- const FivIoModelEntry *entry2 = b;
+ const FivIoModelEntry *entry1 = *(const FivIoModelEntry **) a;
+ const FivIoModelEntry *entry2 = *(const FivIoModelEntry **) b;
GFile *file1 = g_file_new_for_uri(entry1->uri);
GFile *file2 = g_file_new_for_uri(entry2->uri);
int result = model_compare_entries(user_data, entry1, file1, entry2, file2);
@@ -3160,14 +3149,81 @@ model_compare(gconstpointer a, gconstpointer b, gpointer user_data)
return result;
}
+static size_t
+model_strsize(const char *string)
+{
+ if (!string)
+ return 0;
+
+ return strlen(string) + 1;
+}
+
+static char *
+model_strappend(char **p, const char *string, size_t size)
+{
+ if (!string)
+ return *p;
+
+ char *destination = memcpy(*p, string, size);
+ *p += size;
+ return destination;
+}
+
+static FivIoModelEntry *
+model_entry_new(GFile *file, GFileInfo *info)
+{
+ gchar *uri = g_file_get_uri(file);
+ const gchar *target_uri = g_file_info_get_attribute_string(
+ info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
+ const gchar *display_name = g_file_info_get_display_name(info);
+
+ // TODO(p): Make it possible to use g_utf8_collate_key() instead,
+ // which does not use natural sorting.
+ gchar *parse_name = g_file_get_parse_name(file);
+ gchar *collate_key = g_utf8_collate_key_for_filename(parse_name, -1);
+ g_free(parse_name);
+
+ // The entries are immutable. Packing them into the structure
+ // should help memory usage as well as performance.
+ size_t size_uri = model_strsize(uri);
+ size_t size_target_uri = model_strsize(target_uri);
+ size_t size_display_name = model_strsize(display_name);
+ size_t size_collate_key = model_strsize(collate_key);
+
+ FivIoModelEntry *entry = g_rc_box_alloc0(sizeof *entry +
+ size_uri +
+ size_target_uri +
+ size_display_name +
+ size_collate_key);
+
+ gchar *p = (gchar *) entry + sizeof *entry;
+ entry->uri = model_strappend(&p, uri, size_uri);
+ entry->target_uri = model_strappend(&p, target_uri, size_target_uri);
+ entry->display_name = model_strappend(&p, display_name, size_display_name);
+ entry->collate_key = model_strappend(&p, collate_key, size_collate_key);
+
+ entry->filesize = (guint64) g_file_info_get_size(info);
+
+ GDateTime *mtime = g_file_info_get_modification_date_time(info);
+ if (mtime) {
+ entry->mtime_msec = g_date_time_to_unix(mtime) * 1000 +
+ g_date_time_get_microsecond(mtime) / 1000;
+ g_date_time_unref(mtime);
+ }
+
+ g_free(uri);
+ g_free(collate_key);
+ return entry;
+}
+
static gboolean
model_reload_to(FivIoModel *self, GFile *directory,
- GArray *subdirs, GArray *files, GError **error)
+ GPtrArray *subdirs, GPtrArray *files, GError **error)
{
if (subdirs)
- g_array_set_size(subdirs, 0);
+ g_ptr_array_set_size(subdirs, 0);
if (files)
- g_array_set_size(files, 0);
+ g_ptr_array_set_size(files, 0);
GFileEnumerator *enumerator = g_file_enumerate_children(directory,
G_FILE_ATTRIBUTE_STANDARD_TYPE ","
@@ -3197,42 +3253,22 @@ model_reload_to(FivIoModel *self, GFile *directory,
if (self->filtering && g_file_info_get_is_hidden(info))
continue;
- GArray *target = NULL;
+ GPtrArray *target = NULL;
if (g_file_info_get_file_type(info) == G_FILE_TYPE_DIRECTORY)
target = subdirs;
else if (!self->filtering ||
model_supports(self, g_file_info_get_name(info)))
target = files;
- if (!target)
- continue;
-
- FivIoModelEntry entry = {.uri = g_file_get_uri(child),
- .target_uri = g_strdup(g_file_info_get_attribute_string(
- info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI)),
- .display_name = g_strdup(g_file_info_get_display_name(info)),
- .filesize = (guint64) g_file_info_get_size(info)};
-
- GDateTime *mtime = g_file_info_get_modification_date_time(info);
- if (mtime) {
- entry.mtime_msec = g_date_time_to_unix(mtime) * 1000 +
- g_date_time_get_microsecond(mtime) / 1000;
- g_date_time_unref(mtime);
- }
-
- gchar *parse_name = g_file_get_parse_name(child);
- // TODO(p): Make it possible to use g_utf8_collate_key() instead,
- // which does not use natural sorting.
- entry.collate_key = g_utf8_collate_key_for_filename(parse_name, -1);
- g_free(parse_name);
- g_array_append_val(target, entry);
+ if (target)
+ g_ptr_array_add(target, model_entry_new(child, info));
}
g_object_unref(enumerator);
if (subdirs)
- g_array_sort_with_data(subdirs, model_compare, self);
+ g_ptr_array_sort_with_data(subdirs, model_compare, self);
if (files)
- g_array_sort_with_data(files, model_compare, self);
+ g_ptr_array_sort_with_data(files, model_compare, self);
return TRUE;
}
@@ -3251,8 +3287,8 @@ model_reload(FivIoModel *self, GError **error)
static void
model_resort(FivIoModel *self)
{
- g_array_sort_with_data(self->subdirs, model_compare, self);
- g_array_sort_with_data(self->files, model_compare, self);
+ g_ptr_array_sort_with_data(self->subdirs, model_compare, self);
+ g_ptr_array_sort_with_data(self->files, model_compare, self);
g_signal_emit(self, model_signals[FILES_CHANGED], 0);
g_signal_emit(self, model_signals[SUBDIRECTORIES_CHANGED], 0);
@@ -3265,13 +3301,13 @@ static GFile *
model_last_deep_subdirectory(FivIoModel *self, GFile *directory)
{
GFile *result = NULL;
- GArray *subdirs = model_entry_array_new();
+ GPtrArray *subdirs = model_entry_array_new();
if (!model_reload_to(self, directory, subdirs, NULL, NULL))
goto out;
if (subdirs->len) {
- GFile *last = g_file_new_for_uri(
- g_array_index(subdirs, FivIoModelEntry, subdirs->len - 1).uri);
+ FivIoModelEntry *entry = g_ptr_array_index(subdirs, subdirs->len - 1);
+ GFile *last = g_file_new_for_uri(entry->uri);
result = model_last_deep_subdirectory(self, last);
g_object_unref(last);
} else {
@@ -3279,7 +3315,7 @@ model_last_deep_subdirectory(FivIoModel *self, GFile *directory)
}
out:
- g_array_free(subdirs, TRUE);
+ g_ptr_array_free(subdirs, TRUE);
return result;
}
@@ -3293,13 +3329,13 @@ fiv_io_model_get_previous_directory(FivIoModel *self)
return NULL;
GFile *result = NULL;
- GArray *subdirs = model_entry_array_new();
+ GPtrArray *subdirs = model_entry_array_new();
if (!model_reload_to(self, parent_directory, subdirs, NULL, NULL))
goto out;
for (gsize i = 0; i < subdirs->len; i++) {
- GFile *file = g_file_new_for_uri(
- g_array_index(subdirs, FivIoModelEntry, i).uri);
+ FivIoModelEntry *entry = g_ptr_array_index(subdirs, i);
+ GFile *file = g_file_new_for_uri(entry->uri);
if (g_file_equal(file, self->directory)) {
g_object_unref(file);
break;
@@ -3318,7 +3354,7 @@ fiv_io_model_get_previous_directory(FivIoModel *self)
out:
g_object_unref(parent_directory);
- g_array_free(subdirs, TRUE);
+ g_ptr_array_free(subdirs, TRUE);
return result;
}
@@ -3331,14 +3367,14 @@ model_next_directory_within_parents(FivIoModel *self, GFile *directory)
return NULL;
GFile *result = NULL;
- GArray *subdirs = model_entry_array_new();
+ GPtrArray *subdirs = model_entry_array_new();
if (!model_reload_to(self, parent_directory, subdirs, NULL, NULL))
goto out;
gboolean found_self = FALSE;
for (gsize i = 0; i < subdirs->len; i++) {
- result = g_file_new_for_uri(
- g_array_index(subdirs, FivIoModelEntry, i).uri);
+ FivIoModelEntry *entry = g_ptr_array_index(subdirs, i);
+ result = g_file_new_for_uri(entry->uri);
if (found_self)
goto out;
@@ -3350,7 +3386,7 @@ model_next_directory_within_parents(FivIoModel *self, GFile *directory)
out:
g_object_unref(parent_directory);
- g_array_free(subdirs, TRUE);
+ g_ptr_array_free(subdirs, TRUE);
return result;
}
@@ -3360,8 +3396,8 @@ fiv_io_model_get_next_directory(FivIoModel *self)
g_return_val_if_fail(FIV_IS_IO_MODEL(self), NULL);
if (self->subdirs->len) {
- return g_file_new_for_uri(
- g_array_index(self->subdirs, FivIoModelEntry, 0).uri);
+ FivIoModelEntry *entry = g_ptr_array_index(self->subdirs, 0);
+ return g_file_new_for_uri(entry->uri);
}
return model_next_directory_within_parents(self, self->directory);
@@ -3379,8 +3415,8 @@ fiv_io_model_finalize(GObject *gobject)
g_clear_object(&self->directory);
g_clear_object(&self->monitor);
- g_array_free(self->subdirs, TRUE);
- g_array_free(self->files, TRUE);
+ g_ptr_array_free(self->subdirs, TRUE);
+ g_ptr_array_free(self->files, TRUE);
G_OBJECT_CLASS(fiv_io_model_parent_class)->finalize(gobject);
}
@@ -3513,18 +3549,18 @@ fiv_io_model_get_location(FivIoModel *self)
return self->directory;
}
-const FivIoModelEntry *
+FivIoModelEntry *const *
fiv_io_model_get_files(FivIoModel *self, gsize *len)
{
*len = self->files->len;
- return (const FivIoModelEntry *) self->files->data;
+ return (FivIoModelEntry *const *) self->files->pdata;
}
-const FivIoModelEntry *
+FivIoModelEntry *const *
fiv_io_model_get_subdirs(FivIoModel *self, gsize *len)
{
*len = self->subdirs->len;
- return (const FivIoModelEntry *) self->subdirs->data;
+ return (FivIoModelEntry *const *) self->subdirs->pdata;
}
// --- Export ------------------------------------------------------------------
diff --git a/fiv-io.h b/fiv-io.h
index 71917da..3f8c65b 100644
--- a/fiv-io.h
+++ b/fiv-io.h
@@ -135,21 +135,21 @@ GFile *fiv_io_model_get_previous_directory(FivIoModel *self);
/// Returns the next VFS directory in order, or NULL.
GFile *fiv_io_model_get_next_directory(FivIoModel *self);
-// TODO(p): Turn this into a reference-counted object.
-// - If using g_rc_box_*(), we should wrap the {_acquire,_release_full}()
-// functions as fiv_io_model_entry_{ref,unref}().
-// - Ideally, all the strings would follow the struct immediately.
+// These objects are reference-counted using GRcBox.
typedef struct {
- gchar *uri; ///< GIO URI
- gchar *target_uri; ///< GIO URI for any target
- gchar *display_name; ///< Label for the file
- gchar *collate_key; ///< Collate key for the filename
+ const char *uri; ///< GIO URI
+ const char *target_uri; ///< GIO URI for any target
+ const char *display_name; ///< Label for the file
+ const char *collate_key; ///< Collate key for the filename
guint64 filesize; ///< Filesize in bytes
gint64 mtime_msec; ///< Modification time in milliseconds
} FivIoModelEntry;
-const FivIoModelEntry *fiv_io_model_get_files(FivIoModel *self, gsize *len);
-const FivIoModelEntry *fiv_io_model_get_subdirs(FivIoModel *self, gsize *len);
+#define fiv_io_model_entry_ref(e) g_rc_box_acquire(e)
+#define fiv_io_model_entry_unref(e) g_rc_box_release(e)
+
+FivIoModelEntry *const *fiv_io_model_get_files(FivIoModel *self, gsize *len);
+FivIoModelEntry *const *fiv_io_model_get_subdirs(FivIoModel *self, gsize *len);
// --- Export ------------------------------------------------------------------
diff --git a/fiv-sidebar.c b/fiv-sidebar.c
index f688720..6525067 100644
--- a/fiv-sidebar.c
+++ b/fiv-sidebar.c
@@ -357,10 +357,10 @@ update_location(FivSidebar *self)
gtk_container_add(GTK_CONTAINER(self->listbox), row);
gsize len = 0;
- const FivIoModelEntry *subdirs =
+ FivIoModelEntry *const *subdirs =
fiv_io_model_get_subdirs(self->model, &len);
for (gsize i = 0; i < len; i++) {
- GFile *file = g_file_new_for_uri(subdirs[i].uri);
+ GFile *file = g_file_new_for_uri(subdirs[i]->uri);
if ((row = create_row(self, file, "go-down-symbolic")))
gtk_container_add(GTK_CONTAINER(self->listbox), row);
g_object_unref(file);
diff --git a/fiv.c b/fiv.c
index 475d40b..8d25eff 100644
--- a/fiv.c
+++ b/fiv.c
@@ -783,11 +783,11 @@ on_model_files_changed(FivIoModel *model, G_GNUC_UNUSED gpointer user_data)
g_return_if_fail(model == g.model);
gsize len = 0;
- const FivIoModelEntry *files = fiv_io_model_get_files(g.model, &len);
+ FivIoModelEntry *const *files = fiv_io_model_get_files(g.model, &len);
g_ptr_array_free(g.files, TRUE);
g.files = g_ptr_array_new_full(len, g_free);
for (gsize i = 0; i < len; i++)
- g_ptr_array_add(g.files, g_strdup(files[i].uri));
+ g_ptr_array_add(g.files, g_strdup(files[i]->uri));
update_files_index();
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-23 12:32:36 +0000