summaryrefslogtreecommitdiff
path: root/gtk/gtkfilesystemmodel.c
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2009-09-02 14:51:02 -0500
committerBenjamin Otte <otte@gnome.org>2009-10-15 22:06:15 +0200
commit385fa71ec0c7a8f59a729bbba2d8a327f5a62596 (patch)
treec62db7b9129c1855275f8e4eb8ba12cfb553f9b2 /gtk/gtkfilesystemmodel.c
parent6820dee988c9d3dfcec0749d77302a4577f20ff8 (diff)
downloadgtk+-385fa71ec0c7a8f59a729bbba2d8a327f5a62596.tar.gz
Comment on how the file_lookup hash table gets rebuilt on demand
Signed-off-by: Federico Mena Quintero <federico@novell.com>
Diffstat (limited to 'gtk/gtkfilesystemmodel.c')
-rw-r--r--gtk/gtkfilesystemmodel.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index 509a36168e..69cd059b78 100644
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -72,7 +72,12 @@ struct _GtkFileSystemModel
GArray * files; /* array of FileModelNode containing all our files */
GSize node_size; /* Size of a FileModelNode structure once its ->values field has n_columns */
guint n_indexes_valid;/* count of valid indexes */
- GHashTable * file_lookup; /* file => array index table */
+ GHashTable * file_lookup; /* file => array index table.
+ * This hash table doesn't always have the same number of entries as the files array;
+ * it can get cleared completely when we resort.
+ * The hash table gets re-populated in node_get_for_file() if this mismatch is
+ * detected.
+ */
guint n_columns; /* number of columns */
GType * column_types; /* types of each column */
@@ -1490,7 +1495,15 @@ node_get_for_file (GtkFileSystemModel *model,
if (i != 0)
return i;
- /* node 0 is the editable row and has no associated file or entry in the table */
+ /* Node 0 is the editable row and has no associated file or entry in the table, so we start counting from 1.
+ *
+ * The invariant here is that the files in model->files[n] for n < g_hash_table_size (model->file_lookup)
+ * are already added to the hash table. The table can get cleared when we re-sort; this loop merely rebuilds
+ * our (file -> index) mapping on demand.
+ *
+ * If we exit the loop, the next pending batch of mappings will be resolved when this function gets called again
+ * with another file that is not yet in the mapping.
+ */
for (i = g_hash_table_size (model->file_lookup) + 1; i < model->files->len; i++)
{
FileModelNode *node = get_node (model, i);