brasero r1546 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Tue Nov 18 17:26:15 2008
New Revision: 1546
URL: http://svn.gnome.org/viewvc/brasero?rev=1546&view=rev

Log:
	Miscellaneous small improvements (especially don\'t display we\'re probing
	for discs if drive is empty)

	* src/brasero-tool-dialog.c (brasero_tool_dialog_init):
	* src/burn-drive.c (brasero_drive_check_medium_inside),
	(brasero_drive_medium_inside_property_changed_cb),
	(brasero_drive_set_property):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-tool-dialog.c
   trunk/src/burn-drive.c

Modified: trunk/src/brasero-tool-dialog.c
==============================================================================
--- trunk/src/brasero-tool-dialog.c	(original)
+++ trunk/src/brasero-tool-dialog.c	Tue Nov 18 17:26:15 2008
@@ -487,8 +487,6 @@
 	obj->priv->selector = brasero_medium_selection_new ();
 	gtk_widget_show (GTK_WIDGET (obj->priv->selector));
 
-/*	gtk_widget_set_tooltip_text (obj->priv->selector, _("Choose a medium"));*/
-
 	title_str = g_strdup_printf ("<b>%s</b>", _("Select a disc"));
 	gtk_box_pack_start (GTK_BOX (obj->priv->upper_box),
 			    brasero_utils_pack_properties (title_str,
@@ -510,7 +508,7 @@
 
 	/* lower part */
 	obj->priv->lower_box = gtk_vbox_new (FALSE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (obj->priv->lower_box), 6);
+	gtk_container_set_border_width (GTK_CONTAINER (obj->priv->lower_box), 12);
 	gtk_widget_set_sensitive (obj->priv->lower_box, FALSE);
 	gtk_widget_show (obj->priv->lower_box);
 
@@ -544,7 +542,7 @@
 			    obj->priv->lower_box,
 			    FALSE,
 			    FALSE,
-			    6);
+			    0);
 
 	/* buttons */
 	obj->priv->cancel = gtk_button_new_from_stock (GTK_STOCK_CLOSE);

Modified: trunk/src/burn-drive.c
==============================================================================
--- trunk/src/burn-drive.c	(original)
+++ trunk/src/burn-drive.c	Tue Nov 18 17:26:15 2008
@@ -512,6 +512,8 @@
 		g_object_unref (medium);
 		priv->probed = TRUE;
 	}
+	else
+		priv->probed = TRUE;
 }
 
 static void
@@ -524,11 +526,15 @@
 
 	priv = BRASERO_DRIVE_PRIVATE (drive);
 
-	if (key && strcmp (key, "storage.removable.media_available"))
+	if (key && strcmp (key, "storage.removable.media_available")) {
+		priv->probed = TRUE;
 		return;
+	}
 
-	if (udi && strcmp (udi, priv->udi))
+	if (udi && strcmp (udi, priv->udi)) {
+		priv->probed = TRUE;
 		return;
+	}
 
 	brasero_drive_check_medium_inside (drive);
 }
@@ -638,6 +644,7 @@
 	case PROP_UDI:
 		priv->udi = g_strdup (g_value_get_string (value));
 		if (!priv->udi) {
+			priv->probed = TRUE;
 			priv->medium = g_object_new (BRASERO_TYPE_VOLUME,
 						     "drive", object,
 						     NULL);