brasero r1393 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sat Oct 18 13:27:39 2008
New Revision: 1393
URL: http://svn.gnome.org/viewvc/brasero?rev=1393&view=rev

Log:
	Update multi (\"leave session open\") toggle according to changes

	* src/brasero-disc-option-dialog.c
	(brasero_disc_option_dialog_load_multi_state),
	(brasero_disc_option_dialog_update_multi),
	(brasero_disc_option_dialog_valid_media_cb):
	* src/brasero-session-cfg.c (brasero_session_cfg_update):


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

Modified: trunk/src/brasero-disc-option-dialog.c
==============================================================================
--- trunk/src/brasero-disc-option-dialog.c	(original)
+++ trunk/src/brasero-disc-option-dialog.c	Sat Oct 18 13:27:39 2008
@@ -92,10 +92,11 @@
 	gboolean value;
 
 	priv = BRASERO_DISC_OPTION_DIALOG_PRIVATE (dialog);
-
+g_print ("KKLS\n");
 	session = brasero_burn_options_get_session (BRASERO_BURN_OPTIONS (dialog));
 
 	if (!brasero_session_cfg_is_supported (BRASERO_SESSION_CFG (session), BRASERO_BURN_FLAG_MULTI)) {
+g_print ("RRKE\n");
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->multi_toggle), FALSE);
 		gtk_widget_set_sensitive (priv->multi_toggle, FALSE);
 		g_object_unref (session);
@@ -109,7 +110,7 @@
 		g_object_unref (session);
 		return;
 	}
-
+g_print ("jlskjd\n");
 	/* set sensitivity */
 	value = brasero_session_cfg_is_compulsory (BRASERO_SESSION_CFG (session),
 						   BRASERO_BURN_FLAG_MULTI);
@@ -197,7 +198,7 @@
 
 	session = brasero_burn_options_get_session (BRASERO_BURN_OPTIONS (dialog));
 	brasero_burn_session_get_input_type (session, &input);
-
+g_print ("REACHED\n");
 	/* MULTI and Video projects don't get along */
 	if (input.type == BRASERO_TRACK_TYPE_DATA
 	&& (input.subtype.fs_type & BRASERO_IMAGE_FS_VIDEO)
@@ -977,6 +978,9 @@
 	/* for video disc see what's the output : CD or DVD */
 	if (priv->dvd_audio)
 		brasero_disc_option_dialog_update_video (self);
+
+	/* flags could have changed so make sure multi gets updated */
+	brasero_disc_option_dialog_update_multi (self);
 }
 
 static void

Modified: trunk/src/brasero-session-cfg.c
==============================================================================
--- trunk/src/brasero-session-cfg.c	(original)
+++ trunk/src/brasero-session-cfg.c	Sat Oct 18 13:27:39 2008
@@ -538,7 +538,8 @@
 		brasero_burn_session_remove_flag (BRASERO_BURN_SESSION (self),
 						  BRASERO_BURN_FLAG_DUMMY|
 						  BRASERO_BURN_FLAG_NO_TMP_FILES);
-	else if (update)
+
+	if (update)
 		brasero_session_cfg_set_drive_properties (self);
 	else if (check)
 		brasero_session_cfg_check_drive_settings (self);