[totem] main: Fix saving the last used sidebar



commit 09d4692fc066a836a2d24d13893412f50658dd2b
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jul 1 10:45:16 2011 +0100

    main: Fix saving the last used sidebar
    
    We were closing the plugins too early, and always thinking
    that the playlist was the last standing sidebar.

 src/totem-object.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/src/totem-object.c b/src/totem-object.c
index e620233..32298d2 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -946,9 +946,13 @@ totem_object_action_exit (TotemObject *totem)
 	GdkDisplay *display = NULL;
 	char *page_id;
 
+	/* Save the page ID before we close the plugins, otherwise
+	 * we'll never save it properly */
+	page_id = totem_sidebar_get_current_page (totem);
+
 	/* Shut down the plugins first, allowing them to display modal dialogues (etc.) without threat of being killed from another thread */
 	if (totem != NULL && totem->engine != NULL)
-		totem_plugins_engine_shut_down (totem->engine);
+		totem_object_plugins_shutdown (totem);
 
 	/* Exit forcefully if we can't do the shutdown in 10 seconds */
 	g_thread_create ((GThreadFunc) totem_action_wait_force_exit,
@@ -968,11 +972,6 @@ totem_object_action_exit (TotemObject *totem)
 	if (totem->prefs != NULL)
 		gtk_widget_hide (totem->prefs);
 
-	/* Save the page ID before we close the plugins, otherwise
-	 * we'll never save it properly */
-	page_id = totem_sidebar_get_current_page (totem);
-	totem_object_plugins_shutdown (totem);
-
 	if (display != NULL)
 		gdk_display_sync (display);
 



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