diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2000-06-02 20:57:37 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2000-06-02 20:57:37 +0000 |
| commit | aa407de891e029e72e96dc7d334f2abc1f05e932 (patch) | |
| tree | d51326458600a619e620d4e44907b84bce6dcb71 /src/nautilus-window-private.h | |
| parent | bbb7d78b40297eb81bcb373fed63f0dea5cb7c10 (diff) | |
| download | nautilus-aa407de891e029e72e96dc7d334f2abc1f05e932.tar.gz | |
Finished task 968 (Add one-time viewer choice to "View as"
menu temporarily)
* libnautilus-extensions/nautilus-view-identifier.h,
* libnautilus-extensions/nautilus-view-identifier.c:
(nautilus_view_identifier_copy): New function, does the obvious.
* src/nautilus-applicable-views.h: Made NautilusNavigationInfo
store a NautilusViewIdentifier instead of just the iid part
in initial_content_iid (now initial_content_id).
* src/nautilus-applicable-views.c: (set_initial_content_id),
(got_file_info_callback), (nautilus_navigation_info_free):
Reworked code to handle change from char *iid to NautilusViewIdentifier.
* src/nautilus-window.h: New field for content_view_id,
a NautilusViewIdentifier for the current view.
* src/nautilus-window-private.h,
* src/nautilus-window-manage-views.c:
(nautilus_window_load_content_view): Now takes a
NautilusViewIdentifier * instead of just a char *,
and resets content_view_id field.
(nautilus_window_update_state): Reworked code to handle
initial_content_iid change.
* src/nautilus-window.c:
(nautilus_window_destroy): Destroy content_view_id.
(nautilus_window_switch_views), (view_menu_switch_views_callback):
Reworked to take NautilusViewIdentifier * instead of just char *.
(create_content_view_menu_item): New helper function, extracted
from nautilus_window_load_content_view_menu.
(replace_special_current_view_in_content_view_menu): New
function, does the work of putting the current content view
as the initial item in the menu, followed by a separator.
(nautilus_window_synch_content_view_menu): Calls
replace_special_current_view_in_content_menu if the current view
is not found in the menu.
(chose_component_callback): Took out fixed FIXMEs.
(nautilus_window_load_content_view_menu): Now calls function
that was extracted from it.
Diffstat (limited to 'src/nautilus-window-private.h')
| -rw-r--r-- | src/nautilus-window-private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nautilus-window-private.h b/src/nautilus-window-private.h index eaeb9131b..96c6d91eb 100644 --- a/src/nautilus-window-private.h +++ b/src/nautilus-window-private.h @@ -45,7 +45,7 @@ void nautilus_window_begin_location_change(NautilusWindow *window, void nautilus_window_load_content_view_menu (NautilusWindow *window, NautilusNavigationInfo *ni); void nautilus_window_synch_content_view_menu (NautilusWindow *window); NautilusViewFrame *nautilus_window_load_content_view(NautilusWindow *window, - const char *iid, + NautilusViewIdentifier *id, Nautilus_NavigationInfo *navinfo, NautilusViewFrame **requesting_view); void nautilus_window_connect_content_view (NautilusWindow *window, |