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 /components | |
| 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 'components')
| -rw-r--r-- | components/adapter/nautilus-adapter.c | 5 | ||||
| -rw-r--r-- | components/history/nautilus-history-view.c | 5 | ||||
| -rw-r--r-- | components/tree/nautilus-tree-view.c | 14 |
3 files changed, 18 insertions, 6 deletions
diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c index b38ac23eb..67502ee05 100644 --- a/components/adapter/nautilus-adapter.c +++ b/components/adapter/nautilus-adapter.c @@ -221,8 +221,9 @@ nautilus_adapter_open_location_callback (NautilusAdapterEmbedStrategy *strategy const char *uri, NautilusAdapter *adapter) { - nautilus_view_open_location_in_this_window - (adapter->details->nautilus_view, uri); + nautilus_view_open_location + (adapter->details->nautilus_view, + uri, Nautilus_ViewFrame_OPEN_ACCORDING_TO_MODE, 0, NULL); } diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c index 2823c00c7..f911de166 100644 --- a/components/history/nautilus-history-view.c +++ b/components/history/nautilus-history-view.c @@ -168,8 +168,9 @@ row_activated_callback (GtkTreeView *tree_view, /* Navigate to the clicked location. */ uri = nautilus_bookmark_get_uri (NAUTILUS_BOOKMARK (bookmark)); - nautilus_view_open_location_in_this_window - (NAUTILUS_VIEW (view), uri); + nautilus_view_open_location + (NAUTILUS_VIEW (view), + uri, Nautilus_ViewFrame_OPEN_ACCORDING_TO_MODE, 0, NULL); g_free (uri); } diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c index edd3b980b..b570bf7fd 100644 --- a/components/tree/nautilus-tree-view.c +++ b/components/tree/nautilus-tree-view.c @@ -281,7 +281,12 @@ got_activation_uri_callback (NautilusFile *file, gpointer callback_data) /* Non-local executables don't get launched. They act like non-executables. */ if (file_uri == NULL) { - nautilus_view_open_location_in_this_window (NAUTILUS_VIEW (view), uri); + nautilus_view_open_location + (NAUTILUS_VIEW (view), + uri, + Nautilus_ViewFrame_OPEN_ACCORDING_TO_MODE, + 0, + NULL); } else { nautilus_launch_application_from_command (screen, NULL, file_uri, NULL, FALSE); g_free (file_uri); @@ -294,7 +299,12 @@ got_activation_uri_callback (NautilusFile *file, gpointer callback_data) g_free (view->details->selection_location); } view->details->selection_location = g_strdup (uri); - nautilus_view_open_location_in_this_window (NAUTILUS_VIEW (view), uri); + nautilus_view_open_location + (NAUTILUS_VIEW (view), + uri, + Nautilus_ViewFrame_OPEN_ACCORDING_TO_MODE, + 0, + NULL); } } |