brasero r1099 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sat Aug 16 12:58:07 2008
New Revision: 1099
URL: http://svn.gnome.org/viewvc/brasero?rev=1099&view=rev

Log:
Fix problem with import session button not being turn off when clearing project
Also fix a potential bug

Modified:
   trunk/ChangeLog
   trunk/src/brasero-data-disc.c
   trunk/src/brasero-data-session.c

Modified: trunk/src/brasero-data-disc.c
==============================================================================
--- trunk/src/brasero-data-disc.c	(original)
+++ trunk/src/brasero-data-disc.c	Sat Aug 16 12:58:07 2008
@@ -1063,11 +1063,17 @@
 brasero_data_disc_clear (BraseroDisc *disc)
 {
 	BraseroDataDiscPrivate *priv;
+	GtkAction *action;
 
 	priv = BRASERO_DATA_DISC_PRIVATE (disc);
+
 	if (priv->loading)
 		return;
 
+	action = gtk_action_group_get_action (priv->disc_group, "ImportSession");
+	if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
+		gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE);
+
 	if (priv->load_errors) {
 		g_slist_foreach (priv->load_errors, (GFunc) g_free , NULL);
 		g_slist_free (priv->load_errors);

Modified: trunk/src/brasero-data-session.c
==============================================================================
--- trunk/src/brasero-data-session.c	(original)
+++ trunk/src/brasero-data-session.c	Sat Aug 16 12:58:07 2008
@@ -177,7 +177,6 @@
 		node = brasero_data_project_add_imported_session_file (BRASERO_DATA_PROJECT (self),
 								       file,
 								       NULL);
-
 		if (!node)
 			continue;