[nautilus] window: cleanup header
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] window: cleanup header
- Date: Thu, 17 Feb 2011 22:27:20 +0000 (UTC)
commit cff594aeba0cb62f3316eb8a14114091ca4c6d11
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Thu Feb 17 17:26:14 2011 -0500
window: cleanup header
src/nautilus-window-private.h | 19 --------
src/nautilus-window.c | 98 ++++++++++++++--------------------------
src/nautilus-window.h | 14 ------
3 files changed, 34 insertions(+), 97 deletions(-)
---
diff --git a/src/nautilus-window-private.h b/src/nautilus-window-private.h
index d0db8fb..a45473a 100644
--- a/src/nautilus-window-private.h
+++ b/src/nautilus-window-private.h
@@ -104,10 +104,6 @@ struct NautilusWindowDetails
guint extensions_toolbar_merge_id;
GtkActionGroup *extensions_toolbar_action_group;
- /* spinner */
- gboolean spinner_active;
- GtkWidget *spinner;
-
/* focus widget before the location bar has been shown temporarily */
GtkWidget *last_focus_widget;
@@ -151,9 +147,6 @@ struct NautilusWindowDetails
typedef void (*NautilusBookmarkFailedCallback) (NautilusWindow *window,
NautilusBookmark *bookmark);
-void nautilus_window_set_status (NautilusWindow *window,
- NautilusWindowSlot *slot,
- const char *status);
void nautilus_window_load_view_as_menus (NautilusWindow *window);
void nautilus_window_load_extension_menus (NautilusWindow *window);
void nautilus_window_initialize_menus (NautilusWindow *window);
@@ -168,7 +161,6 @@ void nautilus_menus_append_bookmark_to_menu (Nautil
guint merge_id,
GCallback refresh_callback,
NautilusBookmarkFailedCallback failed_callback);
-void nautilus_window_update_find_menu_item (NautilusWindow *window);
NautilusWindowSlot *nautilus_window_open_slot (NautilusWindowPane *pane,
NautilusWindowOpenSlotFlags flags);
@@ -185,9 +177,6 @@ void nautilus_window_set_active_pane (Nautil
NautilusWindowPane *new_pane);
NautilusWindowPane * nautilus_window_get_active_pane (NautilusWindow *window);
-gboolean nautilus_add_bookmark_to_history_list (NautilusBookmark *bookmark);
-void nautilus_window_bookmarks_preference_changed_callback (gpointer user_data);
-
/* sync window GUI with current slot. Used when changing slots,
* and when updating the slot state.
@@ -207,16 +196,8 @@ void nautilus_window_remove_bookmarks_menu_callback (Nautil
void nautilus_window_remove_bookmarks_menu_items (NautilusWindow *window);
void nautilus_window_update_show_hide_menu_items (NautilusWindow *window);
-void nautilus_window_update_spatial_menu_item (NautilusWindow *window);
/* window toolbar */
-void nautilus_window_activate_spinner (NautilusWindow *window);
-void nautilus_window_initialize_toolbars (NautilusWindow *window);
-void nautilus_window_load_extension_toolbar_items (NautilusWindow *window);
-void nautilus_window_set_spinner_active (NautilusWindow *window,
- gboolean active);
-void nautilus_window_go_back (NautilusWindow *window);
-void nautilus_window_go_forward (NautilusWindow *window);
void nautilus_window_close_pane (NautilusWindowPane *pane);
void nautilus_window_update_split_view_actions_sensitivity (NautilusWindow *window);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 661765c..6df340a 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1933,6 +1933,40 @@ nautilus_window_state_event (GtkWidget *widget,
return FALSE;
}
+static void
+nautilus_window_go_back (NautilusWindow *window)
+{
+ nautilus_window_back_or_forward (window, TRUE, 0, FALSE);
+}
+
+static void
+nautilus_window_go_forward (NautilusWindow *window)
+{
+ nautilus_window_back_or_forward (window, FALSE, 0, FALSE);
+}
+
+void
+nautilus_window_allow_back (NautilusWindow *window, gboolean allow)
+{
+ GtkAction *action;
+
+ action = gtk_action_group_get_action (nautilus_navigation_state_get_master (window->details->nav_state),
+ NAUTILUS_ACTION_BACK);
+
+ gtk_action_set_sensitive (action, allow);
+}
+
+void
+nautilus_window_allow_forward (NautilusWindow *window, gboolean allow)
+{
+ GtkAction *action;
+
+ action = gtk_action_group_get_action (nautilus_navigation_state_get_master (window->details->nav_state),
+ NAUTILUS_ACTION_FORWARD);
+
+ gtk_action_set_sensitive (action, allow);
+}
+
static gboolean
nautilus_window_button_press_event (GtkWidget *widget,
GdkEventButton *event)
@@ -2009,40 +2043,6 @@ nautilus_window_restore_focus_widget (NautilusWindow *window)
* Main API
*/
-void
-nautilus_window_go_back (NautilusWindow *window)
-{
- nautilus_window_back_or_forward (window, TRUE, 0, FALSE);
-}
-
-void
-nautilus_window_go_forward (NautilusWindow *window)
-{
- nautilus_window_back_or_forward (window, FALSE, 0, FALSE);
-}
-
-void
-nautilus_window_allow_back (NautilusWindow *window, gboolean allow)
-{
- GtkAction *action;
-
- action = gtk_action_group_get_action (nautilus_navigation_state_get_master (window->details->nav_state),
- NAUTILUS_ACTION_BACK);
-
- gtk_action_set_sensitive (action, allow);
-}
-
-void
-nautilus_window_allow_forward (NautilusWindow *window, gboolean allow)
-{
- GtkAction *action;
-
- action = gtk_action_group_get_action (nautilus_navigation_state_get_master (window->details->nav_state),
- NAUTILUS_ACTION_FORWARD);
-
- gtk_action_set_sensitive (action, allow);
-}
-
void
nautilus_window_show_search (NautilusWindow *window)
{
@@ -2082,36 +2082,6 @@ nautilus_window_set_search_button (NautilusWindow *window,
g_object_set_data (G_OBJECT (action), "blocked", NULL);
}
-/**
- * nautilus_window_get_base_page_index:
- * @window: Window to get index from
- *
- * Returns the index of the base page in the history list.
- * Base page is not the currently displayed page, but the page
- * that acts as the base from which the back and forward commands
- * navigate from.
- */
-gint
-nautilus_window_get_base_page_index (NautilusWindow *window)
-{
- NautilusWindowSlot *slot;
- gint forward_count;
-
- slot = window->details->active_pane->active_slot;
-
- forward_count = g_list_length (slot->forward_list);
-
- /* If forward is empty, the base it at the top of the list */
- if (forward_count == 0) {
- return 0;
- }
-
- /* The forward count indicate the relative postion of the base page
- * in the history list
- */
- return forward_count;
-}
-
static void
nautilus_window_init (NautilusWindow *window)
{
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index f9a9ea4..b6f8aaf 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -93,20 +93,7 @@ typedef struct {
NautilusIconInfo * (* get_icon) (NautilusWindow *window,
NautilusWindowSlot *slot);
- void (* sync_allow_stop) (NautilusWindow *window,
- NautilusWindowSlot *slot);
- void (* set_allow_up) (NautilusWindow *window, gboolean allow);
void (* prompt_for_location) (NautilusWindow *window, const char *initial);
- void (* get_min_size) (NautilusWindow *window, guint *default_width, guint *default_height);
- void (* get_default_size) (NautilusWindow *window, guint *default_width, guint *default_height);
- void (* close) (NautilusWindow *window);
-
- NautilusWindowSlot * (* open_slot) (NautilusWindowPane *pane,
- NautilusWindowOpenSlotFlags flags);
- void (* close_slot) (NautilusWindowPane *pane,
- NautilusWindowSlot *slot);
- void (* set_active_slot) (NautilusWindowPane *pane,
- NautilusWindowSlot *slot);
/* Signals used only for keybindings */
gboolean (* go_up) (NautilusWindow *window,
@@ -170,7 +157,6 @@ void nautilus_window_allow_forward (NautilusWindow *window,
void nautilus_window_clear_back_list (NautilusWindow *window);
void nautilus_window_clear_forward_list (NautilusWindow *window);
void nautilus_forget_history (void);
-gint nautilus_window_get_base_page_index (NautilusWindow *window);
void nautilus_window_hide_sidebar (NautilusWindow *window);
void nautilus_window_show_sidebar (NautilusWindow *window);
void nautilus_window_back_or_forward (NautilusWindow *window,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]