brasero r1353 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sun Oct  5 14:57:16 2008
New Revision: 1353
URL: http://svn.gnome.org/viewvc/brasero?rev=1353&view=rev

Log:
	Update project name on multisession medium loading in data projects

	* src/brasero-project-name.c (brasero_project_name_set_type),
	(brasero_project_name_set_multisession_medium):
	* src/brasero-project.c (brasero_project_update_project_size),
	(brasero_project_flags_changed_cb):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-project-name.c
   trunk/src/brasero-project.c

Modified: trunk/src/brasero-project-name.c
==============================================================================
--- trunk/src/brasero-project-name.c	(original)
+++ trunk/src/brasero-project-name.c	Sun Oct  5 14:57:16 2008
@@ -229,7 +229,11 @@
 	priv->label_modified = FALSE;
 
 	title_str = brasero_project_name_get_default_label (self);
+
+	g_signal_handlers_block_by_func (self, brasero_project_name_label_changed, NULL);
 	gtk_entry_set_text (GTK_ENTRY (self), title_str);
+	g_signal_handlers_unblock_by_func (self, brasero_project_name_label_changed, NULL);
+
 	g_free (title_str);
 }
 
@@ -255,7 +259,11 @@
 		return;
 
 	title_str = brasero_project_name_get_default_label (self);
+
+	g_signal_handlers_block_by_func (self, brasero_project_name_label_changed, NULL);
 	gtk_entry_set_text (GTK_ENTRY (self), title_str);
+	g_signal_handlers_unblock_by_func (self, brasero_project_name_label_changed, NULL);
+
 	g_free (title_str);
 }
 

Modified: trunk/src/brasero-project.c
==============================================================================
--- trunk/src/brasero-project.c	(original)
+++ trunk/src/brasero-project.c	Sun Oct  5 14:57:16 2008
@@ -572,7 +572,6 @@
 		project->priv->status_ctx = gtk_statusbar_get_context_id (GTK_STATUSBAR (status),
 									  "size_project");
 
-
 	gtk_statusbar_pop (GTK_STATUSBAR (status), project->priv->status_ctx);
 
 	string = brasero_utils_get_sectors_string (sectors,
@@ -619,8 +618,16 @@
 				  BraseroBurnFlag flags,
 				  BraseroProject *project)
 {
+	gboolean merging;
+
+	merging = (flags & BRASERO_BURN_FLAG_MERGE) != 0;
+
+	/* see if the project name should be updated */
+	brasero_project_name_set_multisession_medium (BRASERO_PROJECT_NAME (project->priv->name_display),
+						      brasero_data_disc_get_loaded_medium (BRASERO_DATA_DISC (disc)));
+
 	/* we just need to know if MERGE flag is on */
-	project->priv->merging = (flags & BRASERO_BURN_FLAG_MERGE) != 0;
+	project->priv->merging = merging;
 	brasero_project_update_project_size (project, project->priv->sectors);
 }