From: Corey Berla <corey@berla.me>
Date: Mon, 10 Apr 2023 19:56:08 +0000 (-0700)
Subject: filesystemmodel: Notify correct position removed in remove_file()
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~4^2~14^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e041f7bf71bff3f100ce56bf991ae7826562649d;p=gtk4.git

filesystemmodel: Notify correct position removed in remove_file()

32247bc50e63b709ae738a95a2ec71345b5fad75 made several changes to account for the
fact that we no longer have a NULL editable at the beginning of the list
model.  The commit mistakenly left out one change in remove_file(),
which causes the wrong file to be removed.


(cherry picked from commit faac2f7894608eef7e3884897b6a38da854e0fa8)
---

diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index c830751642..2ff527b7b4 100644
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -331,8 +331,6 @@ list_model_get_item (GListModel *list_model,
   GtkFileSystemModel *model = GTK_FILE_SYSTEM_MODEL (list_model);
   FileModelNode *node;
 
-  /* The first items of GtkFileSystemModel is not really a file,
-   * so ignore it. */
   if (position >= model->files->len)
     return NULL;
 
@@ -502,7 +500,7 @@ remove_file (GtkFileSystemModel *model,
 
   g_array_remove_index (model->files, id);
 
-  g_list_model_items_changed (G_LIST_MODEL (model), id - 1, 1, 0);
+  g_list_model_items_changed (G_LIST_MODEL (model), id, 1, 0);
 }
 
 static void