[nautilus] bk-window: use new NautilusApplication API



commit a3ce22ec6e8fcb39dafb35e04e445f4a94b8c394
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Aug 31 02:54:37 2010 +0200

    bk-window: use new NautilusApplication API

 src/nautilus-bookmarks-window.c |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index dfc7b78..207da80 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -568,28 +568,31 @@ open_selected_bookmark (gpointer user_data, GdkScreen *screen)
 	}
 
 	if (NAUTILUS_IS_NAVIGATION_WINDOW (user_data)) {
-		nautilus_window_go_to (NAUTILUS_WINDOW (user_data), location);
+		window = user_data;
 	} else if (NAUTILUS_IS_SPATIAL_WINDOW (user_data)) {
-		window = nautilus_application_present_spatial_window (application, 
-								      NULL,
-								      NULL,
-								      location,
-								      screen);
+		window = nautilus_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 (nautilus_preferences, NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER)) {
 			window = nautilus_application_create_navigation_window (application,
 										NULL,
 										screen);
-			nautilus_window_go_to (window, location);
 		} else {
-			window = nautilus_application_present_spatial_window (application,
-									      NULL,
-									      NULL,
-									      location,
-									      screen);
+			window = nautilus_application_get_spatial_window (application,
+									  NULL,
+									  NULL,
+									  location,
+									  screen,
+									  NULL);
 		}
 	}
 
+	nautilus_window_go_to (window, location);
+
 	g_object_unref (location);
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]