diff options
| author | Dave Camp <dave@ximian.com> | 2003-09-30 20:38:01 +0000 |
|---|---|---|
| committer | Dave Camp <campd@src.gnome.org> | 2003-09-30 20:38:01 +0000 |
| commit | c42ab00ac67db2dc5bd22bff65e1c0a3414fe113 (patch) | |
| tree | 636294d9aadd0aecaa9bf0858a40e49399a224e3 /src/nautilus-view-frame.h | |
| parent | 1f859c83a9c2734ce3645657a065d7faa8c69560 (diff) | |
| download | nautilus-c42ab00ac67db2dc5bd22bff65e1c0a3414fe113.tar.gz | |
Merge the nautilus-spatial-playground branch to HEAD.
2003-09-30 Dave Camp <dave@ximian.com>
* Merge the nautilus-spatial-playground branch to HEAD.
Diffstat (limited to 'src/nautilus-view-frame.h')
| -rw-r--r-- | src/nautilus-view-frame.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h index a24a6d3d7..fabb4a7f1 100644 --- a/src/nautilus-view-frame.h +++ b/src/nautilus-view-frame.h @@ -65,12 +65,10 @@ typedef struct { void (* failed) (NautilusViewFrame *view); /* These will only happen after load_underway (guaranteed). */ - void (* open_location_in_this_window) (NautilusViewFrame *view, - const char *location); - void (* open_location_prefer_existing_window) (NautilusViewFrame *view, - const char *location); - void (* open_location_force_new_window) (NautilusViewFrame *view, + void (* open_location) (NautilusViewFrame *view, const char *location, + Nautilus_ViewFrame_OpenMode mode, + Nautilus_ViewFrame_OpenFlags flags, GList *selection); /* list of char * */ void (* report_location_change) (NautilusViewFrame *view, const char *location, @@ -123,6 +121,9 @@ float nautilus_view_frame_get_max_zoom_level (NautilusViewFr gboolean nautilus_view_frame_get_has_min_zoom_level (NautilusViewFrame *view); gboolean nautilus_view_frame_get_has_max_zoom_level (NautilusViewFrame *view); gboolean nautilus_view_frame_get_is_continuous (NautilusViewFrame *view); +gboolean nautilus_view_frame_get_can_zoom_in (NautilusViewFrame *view); +gboolean nautilus_view_frame_get_can_zoom_out (NautilusViewFrame *view); + GList * nautilus_view_frame_get_preferred_zoom_levels (NautilusViewFrame *view); void nautilus_view_frame_zoom_in (NautilusViewFrame *view); void nautilus_view_frame_zoom_out (NautilusViewFrame *view); |