brasero r752 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Tue Apr 22 11:45:40 2008
New Revision: 752
URL: http://svn.gnome.org/viewvc/brasero?rev=752&view=rev

Log:
	Don\'t save all flags in between sessions but only those that the user can change

	* src/brasero-dest-selection.c
	(brasero_dest_selection_save_drive_properties),
	(brasero_dest_selection_set_drive_properties):
	* src/brasero-disc-copy-dialog.c
	(brasero_disc_copy_dialog_get_session):
	* src/burn.c (brasero_burn_check_session_consistency):

Modified:
   trunk/ChangeLog
   trunk/src/brasero-dest-selection.c
   trunk/src/brasero-disc-copy-dialog.c
   trunk/src/burn.c

Modified: trunk/src/brasero-dest-selection.c
==============================================================================
--- trunk/src/brasero-dest-selection.c	(original)
+++ trunk/src/brasero-dest-selection.c	Tue Apr 22 11:45:40 2008
@@ -95,6 +95,8 @@
 };
 static guint brasero_dest_selection_signals [LAST_SIGNAL] = { 0 };
 
+#define BRASERO_DEST_SAVED_FLAGS	(BRASERO_DRIVE_PROPERTIES_FLAGS|BRASERO_BURN_FLAG_MULTI)
+
 static void
 brasero_dest_selection_save_drive_properties (BraseroDestSelection *self)
 {
@@ -127,7 +129,7 @@
 
 	flags = gconf_client_get_int (client, key, NULL);
 	flags &= ~BRASERO_DRIVE_PROPERTIES_FLAGS;
-	flags |= (brasero_burn_session_get_flags (priv->session) & BRASERO_DRIVE_PROPERTIES_FLAGS);
+	flags |= (brasero_burn_session_get_flags (priv->session) & BRASERO_DEST_SAVED_FLAGS);
 	gconf_client_set_int (client, key, flags, NULL);
 	g_free (key);
 
@@ -928,7 +930,7 @@
 						  BRASERO_BURN_FLAG_DAO);
 
 		/* set new ones */
-		flags = gconf_value_get_int (value);
+		flags = gconf_value_get_int (value) & BRASERO_DEST_SAVED_FLAGS;
 		gconf_value_free (value);
 		brasero_burn_session_add_flag (priv->session, flags);
 
@@ -955,8 +957,9 @@
 		BraseroBurnFlag compulsory = BRASERO_BURN_FLAG_NONE;
 
 		/* set the saved flags (make sure they are supported) */
-		flags = gconf_value_get_int (value);
+		flags = gconf_value_get_int (value) & BRASERO_DEST_SAVED_FLAGS;
 		gconf_value_free (value);
+
 		brasero_dest_selection_add_drive_properties_flags (self,
 								   flags,
 								   &supported,

Modified: trunk/src/brasero-disc-copy-dialog.c
==============================================================================
--- trunk/src/brasero-disc-copy-dialog.c	(original)
+++ trunk/src/brasero-disc-copy-dialog.c	Tue Apr 22 11:45:40 2008
@@ -73,7 +73,6 @@
 	BraseroDiscCopyDialogPrivate *priv;
 
 	priv = BRASERO_DISC_COPY_DIALOG_PRIVATE (self);
-
 	g_object_ref (priv->session);
 	return priv->session;
 }

Modified: trunk/src/burn.c
==============================================================================
--- trunk/src/burn.c	(original)
+++ trunk/src/burn.c	Tue Apr 22 11:45:40 2008
@@ -1755,6 +1755,8 @@
 						     &supported,
 						     &compulsory);
 		}
+		else if (flags & flag)
+			BRASERO_BURN_LOG_FLAGS (flag, "Flag set but not supported");
 	}
 
 	retval = brasero_burn_session_get_flags (priv->session);
@@ -2131,7 +2133,7 @@
 		return BRASERO_BURN_ERR;
 	}
 
-	/* get a new output. Also ask for both  */
+	/* get a new output. Also ask for both */
 	brasero_burn_session_push_settings (priv->session);
 	result = brasero_burn_session_get_tmp_image (priv->session,
 						     format,