Import Upstream version 0.3.7pre

1 files changed, 6 insertions, 47 deletions

diff --git a/v4l.c b/v4l.c
index 6ce5aa02..118d9fde 100644
--- a/v4l.c
+++ b/v4l.c
@@ -35,7 +35,7 @@ V4LDevice *hi_scan_v4l(void)
 	if(!proc_dir)
 		return NULL;
 
-	while (sd = readdir(proc_dir)) {
+	while ((sd = readdir(proc_dir))) {
 		gchar *dev, buffer[128];
 		
 		dev = g_strdup_printf("/proc/video/dev/%s", sd->d_name);
@@ -66,54 +66,18 @@ V4LDevice *hi_scan_v4l(void)
 
 void hi_show_v4l_info(MainWindow *mainwindow, V4LDevice *device)
 {
-	GtkWidget *hbox, *vbox, *label;
 	gchar *buf;
-#ifdef GTK2
-	GtkWidget *pixmap;	
-#endif
 
 	if(!device) return;
 
-	hbox = gtk_hbox_new(FALSE, 2);
-	gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
-	gtk_widget_show(hbox);
-	
-#ifdef GTK2
 	buf = g_strdup_printf("%sv4l.png", IMG_PREFIX);
-	pixmap = gtk_image_new_from_file(buf);
-	gtk_widget_show(pixmap);
-	
-	gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 0);
-	
+	detail_window_set_icon(mainwindow->det_window, buf);	
 	g_free(buf);
-#endif
 
-	if(mainwindow->framec)
-		gtk_widget_destroy(mainwindow->framec);
-
-	gtk_container_add(GTK_CONTAINER(mainwindow->frame), hbox);
-	mainwindow->framec = hbox;
-	
-	gtk_frame_set_label(GTK_FRAME(mainwindow->frame), _("Device Information"));
+	gtk_window_set_title(GTK_WINDOW(mainwindow->det_window->window), _("Device Information"));
 	
-	vbox = gtk_vbox_new(FALSE, 5);
-	gtk_widget_show(vbox);
-	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
 
-#ifdef GTK2
-	buf = g_strdup_printf("<b>%s</b>", device->name);
-	
-	label = gtk_label_new(buf);
-	gtk_widget_show(label);
-	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-	
-	g_free(buf);
-#else
-	label = gtk_label_new(device->name);
-	gtk_widget_show(label);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-#endif
+	detail_window_set_dev_name(mainwindow->det_window, device->name);
 
 	if (device->type) {
 		gchar *b = g_strdup(device->type);
@@ -125,13 +89,8 @@ void hi_show_v4l_info(MainWindow *mainwindow, V4LDevice *device)
 		} while(*b);
 		b = b_start;
 	
-		buf = g_strdup_printf("Type:\n%s", b);
-	
-		label = gtk_label_new(buf);
-		gtk_widget_show(label);
-		gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-	
-		g_free(buf);
+		detail_window_append_info(mainwindow->det_window, _("Type"),
+					  b);
 		g_free(b);
 	}
 }