[brasero] Remove the "eject after burning check" as it does not really make sense as noted in #598478 - burn



commit a6027bdbfba23b72be3f34ce803c4bc9d86f87a8
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Tue Nov 3 15:35:52 2009 +0100

    Remove the "eject after burning check" as it does not really make sense as noted in #598478 -  burn image to cd process is not automatically ejecting the CD

 libbrasero-burn/brasero-drive-properties.c |   31 ----------------------------
 libbrasero-burn/brasero-session-cfg.c      |    7 ++++++
 libbrasero-burn/brasero-session-cfg.h      |    1 -
 3 files changed, 7 insertions(+), 32 deletions(-)
---
diff --git a/libbrasero-burn/brasero-drive-properties.c b/libbrasero-burn/brasero-drive-properties.c
index 544abe9..49c44d2 100644
--- a/libbrasero-burn/brasero-drive-properties.c
+++ b/libbrasero-burn/brasero-drive-properties.c
@@ -64,7 +64,6 @@ struct _BraseroDrivePropertiesPrivate
 	GtkWidget *multi;
 	GtkWidget *burnproof;
 	GtkWidget *notmp;
-	GtkWidget *eject;
 
 	GtkWidget *tmpdir;
 };
@@ -102,23 +101,6 @@ brasero_drive_properties_no_tmp_toggled (GtkToggleButton *button,
 }
 
 static void
-brasero_drive_properties_eject_toggled (GtkToggleButton *button,
-					BraseroDriveProperties *self)
-{
-	BraseroDrivePropertiesPrivate *priv;
-
-	priv = BRASERO_DRIVE_PROPERTIES_PRIVATE (self);
-
-	/* retrieve the flags */
-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->eject)))
-		brasero_session_cfg_add_flags (priv->session,
-					       BRASERO_BURN_FLAG_EJECT);
-	else
-		brasero_session_cfg_remove_flags (priv->session,
-						  BRASERO_BURN_FLAG_EJECT);
-}
-
-static void
 brasero_drive_properties_dummy_toggled (GtkToggleButton *button,
 					BraseroDriveProperties *self)
 {
@@ -483,12 +465,6 @@ brasero_drive_properties_set_flags (BraseroDriveProperties *self,
 						   supported,
 						   compulsory);
 	brasero_drive_properties_set_toggle_state (self,
-						   priv->eject,
-						   BRASERO_BURN_FLAG_EJECT,
-						   flags,
-						   supported,
-						   compulsory);						   
-	brasero_drive_properties_set_toggle_state (self,
 						   priv->burnproof,
 						   BRASERO_BURN_FLAG_BURNPROOF,
 						   flags,
@@ -757,8 +733,6 @@ brasero_drive_properties_init (BraseroDriveProperties *object)
 	gtk_widget_show (priv->dummy);
 	priv->burnproof = gtk_check_button_new_with_mnemonic (_("Use burn_proof (decrease the risk of failures)"));
 	gtk_widget_show (priv->burnproof);
-	priv->eject = gtk_check_button_new_with_mnemonic (_("_Eject after burning"));
-	gtk_widget_show (priv->eject);
 	priv->notmp = gtk_check_button_new_with_mnemonic (_("Burn the image directly _without saving it to disc"));
 	gtk_widget_show (priv->notmp);
 	priv->multi = gtk_check_button_new_with_mnemonic (_("Leave the disc _open to add other files later"));
@@ -773,10 +747,6 @@ brasero_drive_properties_init (BraseroDriveProperties *object)
 			  "toggled",
 			  G_CALLBACK (brasero_drive_properties_burnproof_toggled),
 			  object);
-	g_signal_connect (priv->eject,
-			  "toggled",
-			  G_CALLBACK (brasero_drive_properties_eject_toggled),
-			  object);
 	g_signal_connect (priv->multi,
 			  "toggled",
 			  G_CALLBACK (brasero_drive_properties_multi_toggled),
@@ -789,7 +759,6 @@ brasero_drive_properties_init (BraseroDriveProperties *object)
 	string = g_strdup_printf ("<b>%s</b>", _("Options"));
 	gtk_box_pack_start (GTK_BOX (vbox),
 			    brasero_utils_pack_properties (string,
-							   priv->eject,
 							   priv->dummy,
 							   priv->burnproof,
 							   priv->multi,
diff --git a/libbrasero-burn/brasero-session-cfg.c b/libbrasero-burn/brasero-session-cfg.c
index 443861b..f7163c8 100644
--- a/libbrasero-burn/brasero-session-cfg.c
+++ b/libbrasero-burn/brasero-session-cfg.c
@@ -768,6 +768,13 @@ brasero_session_cfg_set_drive_properties_flags (BraseroSessionCfg *self,
 	                               BRASERO_BURN_FLAG_CHECK_SIZE|
 	                               BRASERO_BURN_FLAG_NOGRACE);
 
+	/* This one is only supported when we are
+	 * burning to a disc or copying a disc but it
+	 * would better be set. */
+	if (priv->supported & BRASERO_BURN_FLAG_EJECT)
+		brasero_burn_session_add_flag (BRASERO_BURN_SESSION (self),
+		                               BRASERO_BURN_FLAG_EJECT);
+
 	/* Always save flags */
 	brasero_session_cfg_save_drive_flags (self, medium);
 }
diff --git a/libbrasero-burn/brasero-session-cfg.h b/libbrasero-burn/brasero-session-cfg.h
index 42ef92b..606cf76 100644
--- a/libbrasero-burn/brasero-session-cfg.h
+++ b/libbrasero-burn/brasero-session-cfg.h
@@ -62,7 +62,6 @@ GType brasero_session_cfg_get_type (void) G_GNUC_CONST;
 
 #define BRASERO_DRIVE_PROPERTIES_FLAGS	       (BRASERO_BURN_FLAG_DUMMY|	\
 						BRASERO_BURN_FLAG_MULTI|	\
-						BRASERO_BURN_FLAG_EJECT|	\
 						BRASERO_BURN_FLAG_BURNPROOF|	\
 						BRASERO_BURN_FLAG_NO_TMP_FILES)
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]