diff options
author | Darin Adler <darin@src.gnome.org> | 2000-09-29 21:34:05 +0000 |
---|---|---|
committer | Darin Adler <darin@src.gnome.org> | 2000-09-29 21:34:05 +0000 |
commit | fb80ae13765036bccf9e151cc3d951101918de12 (patch) | |
tree | 2d9f1b7cebea200cdb231aa8547d2dbc42d1bc84 /src/nautilus-view-frame.c | |
parent | d47828f04bbe9d711385bbc01f3760dfc88468ab (diff) | |
download | nautilus-fb80ae13765036bccf9e151cc3d951101918de12.tar.gz |
Removed unused "self_owned" field.
* libnautilus-extensions/nautilus-file-private.h:
Removed unused "self_owned" field.
* libnautilus/nautilus-view-component.idl:
* libnautilus/nautilus-view.h:
* libnautilus/nautilus-view.c:
(nautilus_view_open_location_in_new_window):
* src/file-manager/fm-directory-view.c:
(fm_directory_view_switch_location):
* src/file-manager/fm-search-list-view.c:
(reveal_selected_items_callback):
* src/nautilus-view-frame-corba.c:
(impl_Nautilus_ViewFrame_open_location),
(impl_Nautilus_ViewFrame_open_location_in_new_window),
(impl_Nautilus_ViewFrame_report_selection_change):
* src/nautilus-view-frame-private.h:
* src/nautilus-view-frame.h:
* src/nautilus-view-frame.c:
(nautilus_view_frame_initialize_class),
(nautilus_view_frame_open_location_in_new_window):
Removed report_location_change and
open_in_new_window_and_select. The open_location_in_new_window
call now always does a selection operation.
* src/nautilus-window-manage-views.h:
* src/nautilus-window-manage-views.c: (update_view),
(nautilus_window_load_sidebar_panel), (open_location),
(nautilus_window_open_location),
(nautilus_window_open_location_in_new_window),
(nautilus_window_load_content_view),
(nautilus_window_update_state),
(nautilus_window_begin_location_change):
* src/nautilus-window-private.h:
* src/nautilus-window.h:
* src/nautilus-window.c: (nautilus_window_switch_views),
(nautilus_window_back_or_forward),
(nautilus_window_open_location_in_new_window_callback),
(nautilus_window_connect_view), (nautilus_window_reload):
Made some simplifications that are possible because we don't
have the old report_location_change to support.
Diffstat (limited to 'src/nautilus-view-frame.c')
-rw-r--r-- | src/nautilus-view-frame.c | 47 |
1 files changed, 3 insertions, 44 deletions
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c index ecbaefe48..8da22b9e3 100644 --- a/src/nautilus-view-frame.c +++ b/src/nautilus-view-frame.c @@ -48,8 +48,6 @@ enum { OPEN_LOCATION, OPEN_LOCATION_IN_NEW_WINDOW, - OPEN_IN_NEW_WINDOW_AND_SELECT, - REPORT_LOCATION_CHANGE, REPORT_SELECTION_CHANGE, REPORT_STATUS, REPORT_LOAD_UNDERWAY, @@ -110,24 +108,8 @@ nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass) object_class->type, GTK_SIGNAL_OFFSET (NautilusViewFrameClass, open_location_in_new_window), - gtk_marshal_NONE__STRING, - GTK_TYPE_NONE, 1, GTK_TYPE_STRING); - signals[OPEN_IN_NEW_WINDOW_AND_SELECT] = - gtk_signal_new ("open_in_new_window_and_select", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, - open_in_new_window_and_select), nautilus_gtk_marshal_NONE__STRING_POINTER, GTK_TYPE_NONE, 2, GTK_TYPE_STRING, GTK_TYPE_POINTER); - signals[REPORT_LOCATION_CHANGE] = - gtk_signal_new ("report_location_change", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, - report_location_change), - gtk_marshal_NONE__STRING, - GTK_TYPE_NONE, 1, GTK_TYPE_STRING); signals[REPORT_SELECTION_CHANGE] = gtk_signal_new ("report_selection_change", GTK_RUN_LAST, @@ -855,40 +837,17 @@ nautilus_view_frame_open_location (NautilusViewFrame *view, void nautilus_view_frame_open_location_in_new_window (NautilusViewFrame *view, - const char *location) + const char *location, + GList *selection) { g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); view_frame_wait_is_over (view); - gtk_signal_emit (GTK_OBJECT (view), signals[OPEN_LOCATION_IN_NEW_WINDOW], location); -} - -void -nautilus_view_frame_open_in_new_window_and_select (NautilusViewFrame *view, - const char *location, - GList *selection) -{ - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - view_frame_wait_is_over (view); - gtk_signal_emit (GTK_OBJECT (view), - signals[OPEN_IN_NEW_WINDOW_AND_SELECT], + gtk_signal_emit (GTK_OBJECT (view), signals[OPEN_LOCATION_IN_NEW_WINDOW], location, selection); } void -nautilus_view_frame_report_location_change (NautilusViewFrame *view, - const char *location) -{ - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - set_up_for_new_location (view); - gtk_signal_emit (GTK_OBJECT (view), - signals[REPORT_LOCATION_CHANGE], location); - view_frame_underway (view); -} - -void nautilus_view_frame_report_selection_change (NautilusViewFrame *view, GList *selection) { |