brasero r1189 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Wed Aug 27 13:18:10 2008
New Revision: 1189
URL: http://svn.gnome.org/viewvc/brasero?rev=1189&view=rev

Log:
	Fix for previous changes

	* src/brasero-project-manager.c
	(brasero_project_manager_sidepane_changed):
	* src/brasero-session.c (brasero_session_die_cb),
	(brasero_session_save_yourself_cb):
	* src/main.c (brasero_app_parse_options), (main):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-project-manager.c
   trunk/src/brasero-session.c
   trunk/src/main.c

Modified: trunk/src/brasero-project-manager.c
==============================================================================
--- trunk/src/brasero-project-manager.c	(original)
+++ trunk/src/brasero-project-manager.c	Wed Aug 27 13:18:10 2008
@@ -476,13 +476,18 @@
 					  BraseroProjectManager *manager)
 {
 	if (!visible) {
+		GtkWidget *toplevel;
+ 		GtkWidget *status;
+ 
 		/* If sidepane is disabled, remove any text about selection */
 		if (manager->priv->io)
 			brasero_io_cancel_by_base (manager->priv->io,
 						   manager->priv->size_preview);
 
-		gtk_statusbar_pop (GTK_STATUSBAR (manager->priv->status),
-				   manager->priv->status_ctx);
+ 		toplevel = gtk_widget_get_toplevel (GTK_WIDGET (manager));
+ 		status = brasero_app_get_statusbar1 (BRASERO_APP (toplevel));
+
+ 		gtk_statusbar_pop (GTK_STATUSBAR (status), manager->priv->status_ctx);
 
 		if (manager->priv->selected) {
 			g_strfreev (manager->priv->selected);

Modified: trunk/src/brasero-session.c
==============================================================================
--- trunk/src/brasero-session.c	(original)
+++ trunk/src/brasero-session.c	Wed Aug 27 13:18:10 2008
@@ -328,7 +328,7 @@
 			BraseroApp *app)
 {
 	brasero_session_save (app, FALSE, FALSE);
-	gtk_widget_destroy (app->mainwin);
+	gtk_widget_destroy (GTK_WIDGET (app));
 }
 
 static gboolean
@@ -349,7 +349,7 @@
 					argc,
 					argv);
 
-    	gtk_widget_destroy (app->mainwin);
+    	gtk_widget_destroy (GTK_WIDGET (app));
 	return TRUE; /* successs */
 }
 

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Wed Aug 27 13:18:10 2008
@@ -49,6 +49,7 @@
 
 #include "brasero-project-manager.h"
 #include "brasero-multi-dnd.h"
+#include "brasero-session.h"
 #include "brasero-utils.h"
 #include "brasero-app.h"
 #include "burn-debug.h"
@@ -141,7 +142,7 @@
 		g_object_unref (file);						\
 		list = g_slist_prepend (list, uri);				\
 	}									\
-	function (BRASERO_PROJECT_MANAGER (app->contents), list);		\
+	function (BRASERO_PROJECT_MANAGER (manager_MACRO), list);		\
 	g_slist_foreach (list, (GFunc) g_free, NULL);				\
 	g_slist_free (list);							\
 }
@@ -235,7 +236,7 @@
 		BRASERO_PROJECT_OPEN_LIST (app, brasero_project_manager_data, files);
 	}
 	else if (disc_blank) {
-		on_erase_cb (NULL, app);
+		brasero_app_blank (app);
 	}
 	else if (open_ncb) {
 		GSList *list = NULL;
@@ -339,7 +340,7 @@
 
 	gtk_widget_realize (app);
 
-	brasero_app_parse_options (app);
+	brasero_app_parse_options (BRASERO_APP (app));
 
 	gtk_widget_show (app);