brasero r1486 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Fri Nov  7 12:21:01 2008
New Revision: 1486
URL: http://svn.gnome.org/viewvc/brasero?rev=1486&view=rev

Log:
	Silenced a warning at start when we were trying to set windows properties
	whereas it wasn\'t already realized.

	* src/brasero-app.c (brasero_app_run):
	* src/brasero-app.h:
	* src/brasero-session.c (brasero_session_load):
	* src/main.c (brasero_app_parse_options), (main):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-app.c
   trunk/src/brasero-app.h
   trunk/src/brasero-session.c
   trunk/src/main.c

Modified: trunk/src/brasero-app.c
==============================================================================
--- trunk/src/brasero-app.c	(original)
+++ trunk/src/brasero-app.c	Fri Nov  7 12:21:01 2008
@@ -249,7 +249,7 @@
 }
 
 void
-brasero_app_run (BraseroApp *app)
+brasero_app_run (BraseroApp *app, gboolean load_default_project)
 {
 	BraseroAppPrivate *priv;
 
@@ -257,6 +257,7 @@
 	priv->is_running = TRUE;
 
 	gtk_widget_realize (GTK_WIDGET (app));
+    	brasero_session_load (app, load_default_project);
 	gtk_widget_show (GTK_WIDGET (app));
 	gtk_main ();
 }

Modified: trunk/src/brasero-app.h
==============================================================================
--- trunk/src/brasero-app.h	(original)
+++ trunk/src/brasero-app.h	Fri Nov  7 12:21:01 2008
@@ -52,7 +52,7 @@
 brasero_app_new (void);
 
 void
-brasero_app_run (BraseroApp *app);
+brasero_app_run (BraseroApp *app, gboolean load_default_project);
 
 void
 brasero_app_blank (BraseroApp *app,

Modified: trunk/src/brasero-session.c
==============================================================================
--- trunk/src/brasero-session.c	(original)
+++ trunk/src/brasero-session.c	Fri Nov  7 12:21:01 2008
@@ -87,8 +87,7 @@
 	/* Make sure that on first run the window has a default size of at least
 	 * 85% of the screen (hardware not GTK+) */
 	screen = gtk_window_get_screen (GTK_WINDOW (app));
-	monitor = gdk_screen_get_monitor_at_window (screen, 
-						    GTK_WIDGET (app)->window);
+	monitor = gdk_screen_get_monitor_at_window (screen, GTK_WIDGET (app)->window);
 	gdk_screen_get_monitor_geometry (screen, monitor, &rect);
 	width = rect.width / 100 * 85;
 	height = rect.height / 100 * 85;

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Fri Nov  7 12:21:01 2008
@@ -159,7 +159,7 @@
 	g_slist_free (list);							\
 }
 
-static gboolean
+static void
 brasero_app_parse_options (BraseroApp *app)
 {
 	gint nb = 0;
@@ -170,8 +170,8 @@
 
     	if (empty_project) {
 		brasero_project_manager_empty (BRASERO_PROJECT_MANAGER (manager));
-	    	brasero_session_load (app, FALSE);
-		return TRUE;
+	    	brasero_app_run (app, FALSE);
+		return;
 	}
 
 	/* we first check that only one of the options was given
@@ -217,12 +217,12 @@
 		/* this can't combine with any other options */
 		brasero_project_manager_set_oneshot (BRASERO_PROJECT_MANAGER (manager), TRUE);
 		brasero_project_manager_copy (BRASERO_PROJECT_MANAGER (manager), device);
-		return FALSE;
+		return;
 	}
 	else if (iso_uri) {
 		brasero_project_manager_set_oneshot (BRASERO_PROJECT_MANAGER (manager), TRUE);
 		BRASERO_PROJECT_OPEN_URI (manager, brasero_project_manager_iso, iso_uri);
-		return FALSE;
+		return;
 	}
 	else if (project_uri) {
 		brasero_project_manager_set_oneshot (BRASERO_PROJECT_MANAGER (manager), TRUE);
@@ -259,7 +259,7 @@
 			device = files [0];
 
 		brasero_app_blank (app, device, TRUE);
-		return FALSE;
+		return;
 	}
 	else if (disc_check) {
 		gchar *device = NULL;
@@ -273,7 +273,7 @@
 			device = files [0];
 
 		brasero_app_check (app, device, TRUE);
-		return FALSE;
+		return;
 	}
 	else if (open_ncb) {
 		GSList *list = NULL;
@@ -320,8 +320,7 @@
 	    	load_default_project = TRUE;
 	}
 
-    	brasero_session_load (app, load_default_project);
-	return TRUE;
+	brasero_app_run (app, load_default_project);
 }
 
 int
@@ -385,8 +384,7 @@
 	if (app == NULL)
 		return 1;
 
-	if (brasero_app_parse_options (BRASERO_APP (app)))
-		brasero_app_run (BRASERO_APP (app));
+	brasero_app_parse_options (BRASERO_APP (app));
 
 	brasero_burn_library_shutdown ();