brasero r1776 - in trunk: . libbrasero-media

[philippr svn gnome org]

Author: philippr
Date: Sat Jan 17 21:44:26 2009
New Revision: 1776
URL: http://svn.gnome.org/viewvc/brasero?rev=1776&view=rev

Log:
2009-01-17  Philippe Rouquier  <ykw localhost localdomain>

	Fixed sensitiveness of media/drive selection when selection is empty

	* libbrasero-media/brasero-drive-selection.c
	(brasero_drive_selection_set_current_drive):
	* libbrasero-media/brasero-medium-selection.c
	(brasero_medium_selection_set_current_medium):


Modified:
   trunk/ChangeLog
   trunk/libbrasero-media/brasero-drive-selection.c
   trunk/libbrasero-media/brasero-medium-selection.c

Modified: trunk/libbrasero-media/brasero-drive-selection.c
==============================================================================
--- trunk/libbrasero-media/brasero-drive-selection.c	(original)
+++ trunk/libbrasero-media/brasero-drive-selection.c	Sat Jan 17 21:44:26 2009
@@ -92,7 +92,12 @@
 	gtk_tree_model_get (model, iter,
 			    DRIVE_COL, &drive,
 			    -1);
-  
+
+	if (drive)
+		gtk_widget_set_sensitive (GTK_WIDGET (self), TRUE);
+	else
+		gtk_widget_set_sensitive (GTK_WIDGET (self), FALSE);
+
 	if (priv->active == drive)
 		return;
   
@@ -101,12 +106,8 @@
   
 	priv->active = drive;
   
-	if (priv->active) {
-		gtk_widget_set_sensitive (GTK_WIDGET (self), TRUE);
+	if (priv->active)
 		g_object_ref (priv->active);
-	}
-	else
-		gtk_widget_set_sensitive (GTK_WIDGET (self), FALSE);
   
 	g_signal_emit (self,
 		       brasero_drive_selection_signals [CHANGED_SIGNAL],

Modified: trunk/libbrasero-media/brasero-medium-selection.c
==============================================================================
--- trunk/libbrasero-media/brasero-medium-selection.c	(original)
+++ trunk/libbrasero-media/brasero-medium-selection.c	Sat Jan 17 21:44:26 2009
@@ -223,6 +223,10 @@
 	gtk_tree_model_get (model, iter,
 			    MEDIUM_COL, &medium,
 			    -1);
+	if (medium)
+		gtk_widget_set_sensitive (GTK_WIDGET (self), TRUE);
+	else
+		gtk_widget_set_sensitive (GTK_WIDGET (self), FALSE);
 
 	if (priv->active == medium)
 		return;
@@ -232,12 +236,8 @@
 
 	priv->active = medium;
 
-	if (priv->active) {
-		gtk_widget_set_sensitive (GTK_WIDGET (self), TRUE);
+	if (priv->active)
 		g_object_ref (priv->active);
-	}
-	else
-		gtk_widget_set_sensitive (GTK_WIDGET (self), FALSE);
 
 	g_signal_emit (self,
 		       brasero_medium_selection_signals [CHANGED_SIGNAL],