[nautilus] window-slot: move window_slot_close() to nautilus-window-slot.c
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] window-slot: move window_slot_close() to nautilus-window-slot.c
- Date: Thu, 17 Feb 2011 16:32:04 +0000 (UTC)
commit 3634db080bcf57534b47860908370da5d5cdfad9
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Feb 16 09:52:26 2011 -0500
window-slot: move window_slot_close() to nautilus-window-slot.c
Why on earth should it be somewhere else?
src/nautilus-application.c | 2 +-
src/nautilus-navigation-window-pane.c | 2 +-
src/nautilus-window-manage-views.c | 2 +-
src/nautilus-window-menus.c | 2 +-
src/nautilus-window-slot.h | 1 -
src/nautilus-window.c | 6 ------
6 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 663c76c..a1b1792 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -1215,7 +1215,7 @@ mount_removed_callback (GVolumeMonitor *monitor,
if (should_close_slot_with_mount (window, slot, mount) &&
slot != force_no_close_slot) {
- nautilus_window_slot_close (slot);
+ nautilus_window_pane_slot_close (slot->pane, slot);
} else {
computer = g_file_new_for_uri ("computer:///");
nautilus_window_slot_go_to (slot, computer, FALSE);
diff --git a/src/nautilus-navigation-window-pane.c b/src/nautilus-navigation-window-pane.c
index b9979d7..2e8ca5c 100644
--- a/src/nautilus-navigation-window-pane.c
+++ b/src/nautilus-navigation-window-pane.c
@@ -388,7 +388,7 @@ notebook_popup_menu_close_cb (GtkMenuItem *menuitem,
pane = NAUTILUS_WINDOW_PANE (user_data);
slot = pane->active_slot;
- nautilus_window_slot_close (slot);
+ nautilus_window_pane_slot_close (pane, slot);
}
static void
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 4441e15..7625dde 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -1119,7 +1119,7 @@ got_file_info_for_view_selection_callback (NautilusFile *file,
/* We're missing a previous location (if opened location
* in a new tab) so close it and return */
if (slot->location == NULL) {
- nautilus_window_slot_close (slot);
+ nautilus_window_pane_slot_close (slot->pane, slot);
} else {
/* We disconnected this, so we need to re-connect it */
viewed_file = nautilus_file_get (slot->location);
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 4633d59..fcd1770 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -73,7 +73,7 @@ action_close_window_slot_callback (GtkAction *action,
window = NAUTILUS_WINDOW (user_data);
slot = nautilus_window_get_active_slot (window);
- nautilus_window_slot_close (slot);
+ nautilus_window_pane_slot_close (slot->pane, slot);
}
static void
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index 3663a29..c5f815a 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -124,7 +124,6 @@ void nautilus_window_slot_update_query_editor (NautilusWindowSlot *slot);
GFile * nautilus_window_slot_get_location (NautilusWindowSlot *slot);
char * nautilus_window_slot_get_location_uri (NautilusWindowSlot *slot);
-void nautilus_window_slot_close (NautilusWindowSlot *slot);
void nautilus_window_slot_reload (NautilusWindowSlot *slot);
void nautilus_window_slot_open_location_full (NautilusWindowSlot *slot,
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 22a8d81..4c04c95 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -816,12 +816,6 @@ nautilus_window_set_active_slot (NautilusWindow *window, NautilusWindowSlot *new
}
}
-void
-nautilus_window_slot_close (NautilusWindowSlot *slot)
-{
- nautilus_window_pane_slot_close (slot->pane, slot);
-}
-
static void
nautilus_window_get_preferred_width (GtkWidget *widget,
gint *minimal_width,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]