remove separators from the dialogs

2003-01-24  Bastien Nocera  <hadess@hadess.net>

        * data/playlist.glade:
	* data/properties.glade:
	* data/totem.glade: remove separators from the dialogs
	* src/bacon-cd-selection.c: (cdrom_option_menu):
	* src/cd-drive.c: (parse_sg_line), (get_scsi_cd_name),
	(cdrom_get_name): update these from libbacon, fixes a crash on startup
	on machines using ide-scsi
	* src/gtk-xine.c:
	* src/gtk-xine.h:
	* src/totem.c: (main): removed gtk_xine_check() calls, not needed
	anymore

5 files changed, 11 insertions, 24 deletions

diff --git a/src/bacon-cd-selection.c b/src/bacon-cd-selection.c
index 9b55916ea..8feac3bd0 100644
--- a/src/bacon-cd-selection.c
+++ b/src/bacon-cd-selection.c
@@ -212,7 +212,11 @@ cdrom_option_menu (BaconCdSelection *bcs)
 	for (l = bcs->priv->cdroms; l != NULL; l = l->next)
 	{
 		cdrom = l->data;
-		item = gtk_menu_item_new_with_label (cdrom->display_name);
+
+		if (cdrom->display_name == NULL)
+			g_warning ("cdrom->display_name != NULL failed");
+		item = gtk_menu_item_new_with_label (cdrom->display_name
+				? cdrom->display_name : _("Unnamed CDROM"));
 		gtk_widget_show (item);
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 	}
diff --git a/src/cd-drive.c b/src/cd-drive.c
index 37ce12660..d7e2017b9 100644
--- a/src/cd-drive.c
+++ b/src/cd-drive.c
@@ -141,7 +141,7 @@ parse_sg_line (char *device_str, char *devices, struct scsi_unit *scsi_unit)
 	scsi_unit->vendor = g_strdup (g_strstrip (vendor));
 	scsi_unit->model = g_strdup (g_strstrip (model));
 	scsi_unit->rev = g_strdup (g_strstrip (rev));
-
+	
 	if (sscanf (devices, "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d",
 		    &host_no,
 		    &channel, &scsi_unit->id, &scsi_unit->lun, &scsi_unit->type,
@@ -278,8 +278,6 @@ get_scsi_cd_name (int bus, int id, int lun, const char *dev,
 				scsi_unit->vendor,
 				scsi_unit->model);
 }
-		  
-
 
 static GList *
 add_linux_cd_recorder (GList *cdroms,
@@ -319,8 +317,11 @@ cdrom_get_name (struct cdrom_unit *cdrom, struct scsi_unit *scsi_units, int n_sc
 
 	g_return_val_if_fail (cdrom != NULL, FALSE);
 
-	if (cdrom->device[0] == 's' &&
-	    cdrom->device[1] == 'r') {
+	if ((cdrom->device[0] == 's' &&
+	    cdrom->device[1] == 'r') ||
+	    (cdrom->device[0] == 's' &&
+	    cdrom->device[1] == 'c' &&
+	    cdrom->device[2] == 'd')) {
 		get_cd_scsi_id (cdrom->device, &bus, &id, &lun);
 
 		retval = get_scsi_cd_name (bus, id, lun, cdrom->device, scsi_units, n_scsi_units);
diff --git a/src/gtk-xine.c b/src/gtk-xine.c
index 4fc7b2228..26b10425f 100644
--- a/src/gtk-xine.c
+++ b/src/gtk-xine.c
@@ -1067,18 +1067,6 @@ gtk_xine_new (int width, int height, gboolean null_out)
 	return gtx;
 }
 
-gboolean
-gtk_xine_check (GtkXine *gtx)
-{
-	g_return_val_if_fail (gtx != NULL, FALSE);
-	g_return_val_if_fail (GTK_IS_XINE (gtx), FALSE);
-
-	if (gtx->priv->stream == NULL)
-		return FALSE;
-
-	return gtx->priv->init_finished;
-}
-
 static gboolean
 gtk_xine_expose (GtkWidget *widget, GdkEventExpose *event)
 {
diff --git a/src/gtk-xine.h b/src/gtk-xine.h
index 89fa7c887..cee036ff2 100644
--- a/src/gtk-xine.h
+++ b/src/gtk-xine.h
@@ -104,8 +104,6 @@ GtkType gtk_xine_get_type              (void);
 GtkWidget *gtk_xine_new		       (int width, int height,
 					gboolean null_video_out);
 
-gboolean  gtk_xine_check               (GtkXine *gtx);
-
 /* Actions */
 gboolean gtk_xine_open                (GtkXine *gtx, const gchar *mrl);
 
diff --git a/src/totem.c b/src/totem.c
index 1cbb842a8..aed8083fa 100644
--- a/src/totem.c
+++ b/src/totem.c
@@ -2665,10 +2665,6 @@ main (int argc, char **argv)
 
 	if (argc > 1)
 	{
-		/* Use gtk_xine_check to wait until xine has finished
-		 * initialising completely, otherwise this can turn up nasty */
-		while (gtk_xine_check (GTK_XINE (totem->gtx)) == FALSE)
-			usleep (100000);
 		if (totem_action_open_files (totem, argv, TRUE))
 			totem_action_play_pause (totem);
 		else