diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-04-19 22:33:59 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-04-19 22:33:59 +0000 |
| commit | 670fd0d0896d1f76172e991784c9bfd247bc2a7a (patch) | |
| tree | 579e0513477478d10fa95e82ed27a97df47275bd /src/nautilus-object-window.h | |
| parent | c41c44e4f19fe781e1e6d0702ea5e8d2a31b4a07 (diff) | |
| download | nautilus-670fd0d0896d1f76172e991784c9bfd247bc2a7a.tar.gz | |
Fix bug 8000 (Can get two identical "View as" items in "View as"
menu):
* src/nautilus-window-private.h:
* src/nautilus-window-manage-views.h:
* src/nautilus-window-manage-views.c:
(location_has_really_changed): Make logic clearer by using else
instead of two if statements.
(view_frame_info_new), (view_frame_info_free),
(set_view_frame_info), (view_frame_get_label),
(view_frame_get_id), (nautilus_window_get_content_view_id),
(load_content_view), (nautilus_window_set_sidebar_panels): Store a
NautilusViewIdentifier with each view.
* src/nautilus-window.h:
* src/nautilus-window.c: (nautilus_window_destroy): We no longer
have to store the content view identifier separately.
(remove_first_child): New function.
(update_extra_viewer_in_view_as_menus): Shared by the two below,
this is the old replace_extra_viewer_in_view_as_menus, simplified
and changed to support both adding and removing the extra viewer.
(remove_extra_viewer_in_view_as_menus): Cover for removing.
(replace_extra_viewer_in_view_as_menus): Cover for adding.
(nautilus_window_synch_view_as_menus): Simplify code a lot by
removing some special cases and taking advantage of the fact that
the position of the chosen item is always the same in both menus.
(chose_component_callback): Removed the FIXME now that the bug is
fixed.
* NEWS: Tweak wording.
Diffstat (limited to 'src/nautilus-object-window.h')
| -rw-r--r-- | src/nautilus-object-window.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/nautilus-object-window.h b/src/nautilus-object-window.h index f17348f47..d3d189133 100644 --- a/src/nautilus-object-window.h +++ b/src/nautilus-object-window.h @@ -94,7 +94,6 @@ struct NautilusWindow { /* Current views stuff */ NautilusViewFrame *content_view; - NautilusViewIdentifier *content_view_id; GList *sidebar_panels; /* Widgets to keep track of (for state changes, etc) */ |