diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-19 01:45:59 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:51 +0200 |
| commit | d92e8f674131476d7382496cbc37a5827cef0c84 (patch) | |
| tree | 62d2f6e055671df4bc7e181c7a8e86440d0053f9 | |
| parent | dd924575b8e1fd4c99acf3c8f3860fc38798f0e8 (diff) | |
| download | caja-d92e8f674131476d7382496cbc37a5827cef0c84.tar.bz2 caja-d92e8f674131476d7382496cbc37a5827cef0c84.tar.xz | |
[bookmarks-window] use new CajaApplication API
http://git.gnome.org/browse/nautilus/commit/?id=a3ce22ec6e8fcb39dafb35e04e445f4a94b8c394
| -rw-r--r-- | src/caja-bookmarks-window.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c index 86c80bc5..2ce15aae 100644 --- a/src/caja-bookmarks-window.c +++ b/src/caja-bookmarks-window.c @@ -582,35 +582,35 @@ open_selected_bookmark (gpointer user_data, GdkScreen *screen) if (CAJA_IS_NAVIGATION_WINDOW (user_data)) { - caja_window_go_to (CAJA_WINDOW (user_data), location); + window = user_data; } else if (CAJA_IS_SPATIAL_WINDOW (user_data)) { - window = caja_application_present_spatial_window (application, - NULL, - NULL, - location, - screen); - } - else /* window that opened bookmarks window has been closed */ - { - if (parent_is_browser_window || g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_ALWAYS_USE_BROWSER)) - { + window = caja_application_get_spatial_window (application, + NULL, + NULL, + location, + screen, + NULL); + } else { /* window that opened bookmarks window has been closed */ + if (parent_is_browser_window || g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_ALWAYS_USE_BROWSER)) { window = caja_application_create_navigation_window (application, NULL, screen); - caja_window_go_to (window, location); } else { - window = caja_application_present_spatial_window (application, - NULL, - NULL, - location, - screen); + window = caja_application_get_spatial_window (application, + NULL, + NULL, + location, + screen, + NULL); } } + caja_window_go_to (window, location); + g_object_unref (location); } |