[nautilus/wip/gbsneto/other-locations] files-view: drop NautilusFilesView::get_nautilus_window_slot



commit 8ece35397a6f1b04e7c69db562f66e1d2d9fc174
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Thu Jun 25 09:52:13 2015 -0300

    files-view: drop NautilusFilesView::get_nautilus_window_slot

 src/nautilus-files-view-dnd.c |    2 +-
 src/nautilus-files-view.c     |    8 --------
 src/nautilus-files-view.h     |    1 -
 src/nautilus-window.c         |    2 +-
 4 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/src/nautilus-files-view-dnd.c b/src/nautilus-files-view-dnd.c
index 9d4dfc6..e1f0831 100644
--- a/src/nautilus-files-view-dnd.c
+++ b/src/nautilus-files-view-dnd.c
@@ -532,7 +532,7 @@ nautilus_files_view_handle_hover (NautilusFilesView *view,
        NautilusFile *target_file;
        gboolean target_is_dir;
 
-       slot = nautilus_files_view_get_nautilus_window_slot (view);
+       slot = NAUTILUS_WINDOW_SLOT (gtk_widget_get_ancestor (GTK_WIDGET (view), NAUTILUS_TYPE_WINDOW_SLOT));
 
        location = g_file_new_for_uri (target_uri);
        target_file = nautilus_file_get_existing (location);
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 65ec1a3..66359ed 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -721,14 +721,6 @@ nautilus_files_view_get_window (NautilusFilesView  *view)
        return nautilus_window_slot_get_window (view->details->slot);
 }
 
-NautilusWindowSlot *
-nautilus_files_view_get_nautilus_window_slot (NautilusFilesView  *view)
-{
-       g_assert (view->details->slot != NULL);
-
-       return view->details->slot;
-}
-
 /* Returns the GtkWindow that this directory view occupies, or NULL
  * if at the moment this directory view is not in a GtkWindow or the
  * GtkWindow cannot be determined. Primarily used for parenting dialogs.
diff --git a/src/nautilus-files-view.h b/src/nautilus-files-view.h
index 203f450..9ad0b0c 100644
--- a/src/nautilus-files-view.h
+++ b/src/nautilus-files-view.h
@@ -285,7 +285,6 @@ NautilusFilesView *      nautilus_files_view_new                              (c
                                                                    NautilusWindowSlot *slot);
 
 /* Functions callable from the user interface and elsewhere. */
-NautilusWindowSlot *nautilus_files_view_get_nautilus_window_slot         (NautilusFilesView  *view);
 char *              nautilus_files_view_get_uri                          (NautilusFilesView  *view);
 
 void                nautilus_files_view_display_selection_info           (NautilusFilesView  *view);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index a5f9791..dc45702 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -2112,7 +2112,7 @@ nautilus_window_view_visible (NautilusWindow *window,
         *
         * Needs more investigation...
         */
-       slot = nautilus_files_view_get_nautilus_window_slot (view);
+       slot = NAUTILUS_WINDOW_SLOT (gtk_widget_get_ancestor (GTK_WIDGET (view), NAUTILUS_TYPE_WINDOW_SLOT));
        if (g_object_get_data (G_OBJECT (slot), "nautilus-window-view-visible") != NULL) {
                return;
        }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]