[nautilus/wip/csoriano/nautilus-3.24.1: 6/14] files-view: Remove directory parameter from add_files signal

[Carlos Soriano <csoriano src gnome org>]

commit 60cc1ee6ef34c93bf826810e855de00bdd503119
Author: Carlos Soriano <csoriano gnome org>
Date:   Wed Mar 29 16:17:25 2017 +0200

    files-view: Remove directory parameter from add_files signal
    
    It's not longer necessary. This patch removes it and also fixes
    a compiler warning.

 src/nautilus-canvas-view.c          |    5 +----
 src/nautilus-files-view.c           |    4 ++--
 src/nautilus-files-view.h           |    3 +--
 src/nautilus-list-view.c            |   12 ++++++++++--
 src/nautilus-view-icon-controller.c |    3 +--
 5 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index a1a1bc7..b3a062f 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -455,15 +455,12 @@ nautilus_canvas_view_remove_file (NautilusFilesView *view,
 
 static void
 nautilus_canvas_view_add_files (NautilusFilesView *view,
-                                GList             *files,
-                                NautilusDirectory *directory)
+                                GList             *files)
 {
     NautilusCanvasView *canvas_view;
     NautilusCanvasContainer *canvas_container;
     GList *l;
 
-    g_assert (directory == nautilus_files_view_get_model (view));
-
     canvas_view = NAUTILUS_CANVAS_VIEW (view);
     canvas_container = get_canvas_container (canvas_view);
 
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index a305ef8..a33c951 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -4106,7 +4106,7 @@ process_old_files (NautilusFilesView *view)
         if (files_added != NULL)
         {
             g_signal_emit (view,
-                           signals[ADD_FILES], 0, pending_additions, pending->directory);
+                           signals[ADD_FILES], 0, pending_additions);
         }
 
         for (node = files_changed; node != NULL; node = node->next)
@@ -9359,7 +9359,7 @@ nautilus_files_view_class_init (NautilusFilesViewClass *klass)
                       G_STRUCT_OFFSET (NautilusFilesViewClass, add_files),
                       NULL, NULL,
                       g_cclosure_marshal_generic,
-                      G_TYPE_NONE, 2, G_TYPE_POINTER, NAUTILUS_TYPE_DIRECTORY);
+                      G_TYPE_NONE, 1, G_TYPE_POINTER);
     signals[BEGIN_FILE_CHANGES] =
         g_signal_new ("begin-file-changes",
                       G_TYPE_FROM_CLASS (klass),
diff --git a/src/nautilus-files-view.h b/src/nautilus-files-view.h
index f7f2525..aff0133 100644
--- a/src/nautilus-files-view.h
+++ b/src/nautilus-files-view.h
@@ -61,8 +61,7 @@ struct _NautilusFilesViewClass {
          * It must be replaced by each subclass.
          */
         void    (* add_files)                    (NautilusFilesView *view,
-                                                  GList             *files,
-                                                  NautilusDirectory *directory);
+                                                  GList             *files);
         void    (* remove_file)                 (NautilusFilesView *view,
                                                  NautilusFile      *file,
                                                  NautilusDirectory *directory);
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 2d4a34a..30b0e02 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -2063,8 +2063,7 @@ create_and_set_up_tree_view (NautilusListView *view)
 
 static void
 nautilus_list_view_add_files (NautilusFilesView *view,
-                              GList      *files,
-                              NautilusDirectory *directory)
+                              GList             *files)
 {
     NautilusListModel *model;
     GList *l;
@@ -2072,7 +2071,16 @@ nautilus_list_view_add_files (NautilusFilesView *view,
     model = NAUTILUS_LIST_VIEW (view)->details->model;
     for (l = files; l != NULL; l = l->next)
     {
+        NautilusFile *parent;
+        NautilusDirectory *directory;
+
+        parent = nautilus_file_get_parent (NAUTILUS_FILE (l->data));
+        directory = nautilus_directory_get_for_file (parent);
+        g_print ("file %s parent %s directory %s\n", nautilus_file_get_uri (l->data), nautilus_file_get_uri 
(parent), nautilus_directory_get_uri (directory));
         nautilus_list_model_add_file (model, NAUTILUS_FILE (l->data), directory);
+
+        nautilus_file_unref (parent);
+        nautilus_directory_unref (directory);
     }
 }
 
diff --git a/src/nautilus-view-icon-controller.c b/src/nautilus-view-icon-controller.c
index b432363..6f43631 100644
--- a/src/nautilus-view-icon-controller.c
+++ b/src/nautilus-view-icon-controller.c
@@ -742,8 +742,7 @@ action_sort_order_changed (GSimpleAction *action,
 
 static void
 real_add_files (NautilusFilesView *files_view,
-                GList             *files,
-                NautilusDirectory *directory)
+                GList             *files)
 {
     NautilusViewIconController *self = NAUTILUS_VIEW_ICON_CONTROLLER (files_view);
     g_autoptr (GQueue) files_queue;