brasero r1927 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Mon Feb 16 19:47:37 2009
New Revision: 1927
URL: http://svn.gnome.org/viewvc/brasero?rev=1927&view=rev

Log:
2009-02-16  Philippe Rouquier  <ykw localhost localdomain>

	When starting window less to burn project file contents respect the label

	* src/brasero-disc-option-dialog.c
	(brasero_disc_option_dialog_add_data_options):
	* src/brasero-project.c (brasero_project_burn):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-disc-option-dialog.c
   trunk/src/brasero-project.c

Modified: trunk/src/brasero-disc-option-dialog.c
==============================================================================
--- trunk/src/brasero-disc-option-dialog.c	(original)
+++ trunk/src/brasero-disc-option-dialog.c	Mon Feb 16 19:47:37 2009
@@ -400,13 +400,22 @@
 	brasero_burn_options_add_options (BRASERO_BURN_OPTIONS (dialog), widget);
 
 	if (!brasero_app_is_running (brasero_app_get_default ())) {
+		const gchar *label;
+		BraseroBurnSession *session;
+
 		/* Add the volume name widget but if and only if there isn't any
 		 * label already set in the BraseroBurnSession object. */
 
 		priv->label = brasero_project_name_new ();
 		brasero_project_name_set_type (BRASERO_PROJECT_NAME (priv->label),
 					       BRASERO_PROJECT_TYPE_DATA);
-		
+
+		session = brasero_burn_options_get_session (BRASERO_BURN_OPTIONS (dialog));
+		label = brasero_burn_session_get_label (session);
+		g_object_unref (session);
+		if (label)
+			gtk_entry_set_text (GTK_ENTRY (priv->label), label);
+
 		string = g_strdup_printf ("<b>%s</b>", _("Disc name"));
 		options = brasero_utils_pack_properties (string,
 							 priv->label,

Modified: trunk/src/brasero-project.c
==============================================================================
--- trunk/src/brasero-project.c	(original)
+++ trunk/src/brasero-project.c	Mon Feb 16 19:47:37 2009
@@ -935,6 +935,20 @@
 
 	/* setup, show, and run options dialog */
 	dialog = brasero_disc_option_dialog_new ();
+
+	if (!brasero_app_is_running (brasero_app_get_default ())) {
+		const gchar *label;
+
+		/* Set the label for the session in the burn option dialog but
+		 * only if we were started to burn a project (like through
+		 * nautilus). */
+		label = gtk_entry_get_text (GTK_ENTRY (project->priv->name_display));
+
+		session = brasero_burn_options_get_session (BRASERO_BURN_OPTIONS (dialog));
+		brasero_burn_session_set_label (session, label);
+		g_object_unref (session);
+	}
+
 	brasero_disc_option_dialog_set_disc (BRASERO_DISC_OPTION_DIALOG (dialog),
 					     project->priv->current);