Import Upstream version 0.3.7pre

1 files changed, 14 insertions, 57 deletions

diff --git a/serial.c b/serial.c
index 0de96982..7bb5ebc7 100644
--- a/serial.c
+++ b/serial.c
@@ -12,8 +12,8 @@ SerialDevice *hi_scan_serial(void)
 {
 	FILE *proc_tty;
 	struct stat st;
-	const gchar *ser_drv="/proc/tty/driver/serial";
-	gint n=0;
+	const gchar *ser_drv = "/proc/tty/driver/serial";
+	gint n = 0;
 	SerialDevice *serial_dev, *serial;
 	
 	serial = NULL;
@@ -28,7 +28,7 @@ SerialDevice *hi_scan_serial(void)
 			gchar *buf = buffer;
 		
 			if(*buf == 's') continue;
-			if(strstr(buf, "unknown")) continue;
+			if(strstr(buffer, "unknown")) continue;
 		
 			serial_dev = g_new0(SerialDevice, 1);
 			
@@ -36,10 +36,10 @@ SerialDevice *hi_scan_serial(void)
 			serial = serial_dev;
 
 			serial_dev->name = g_strdup_printf
-				("Serial Port (tty%d)", buffer[0]-'0');
+				(_("Serial Port (tty%d)"), buffer[0]-'0');
 
 			walk_until('t');
-			buf+=2;
+			buf += 2;
 			start = buf;
 			walk_until(' ');
 			end = buf;
@@ -64,60 +64,17 @@ SerialDevice *hi_scan_serial(void)
 
 void hi_show_serial_info(MainWindow *mainwindow, SerialDevice *device)
 {
-	GtkWidget *hbox, *vbox, *label;
-	gchar *buf;
-#ifdef GTK2
-	GtkWidget *pixmap;
-	
-	pixmap = gtk_image_new_from_file(IMG_PREFIX "gen_connector.png");
-	gtk_widget_show(pixmap);
-#endif
-
 	if(!device) return;
 
-	hbox = gtk_hbox_new(FALSE, 2);
-	gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
-	gtk_widget_show(hbox);
-	
-	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), _("Communication Port"));
-	
-#ifdef GTK2
-	gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 0);
-#endif
-
-	vbox = gtk_vbox_new(FALSE, 2);
-	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_label_set_use_markup(GTK_LABEL(label), TRUE);
-	gtk_label_set_selectable(GTK_LABEL(label), TRUE);
-	
-	g_free(buf);
-#else
-	label = gtk_label_new(device->name);
-#endif
-	gtk_widget_show(label);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-	
-	buf = g_strdup_printf(_("I/O port: 0x%x, IRQ: %d"), device->port, device->irq);
-	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_set_icon(mainwindow->det_window, IMG_PREFIX "gen_connector.png");
+	gtk_window_set_title(GTK_WINDOW(mainwindow->det_window->window), _("Communication Port"));
 
-	buf = g_strdup_printf("UART: %s", device->uart);
-	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_set_dev_name(mainwindow->det_window, device->name);
+	detail_window_set_dev_type(mainwindow->det_window, _("Communication Port"));
 	
+	detail_window_append_info_int(mainwindow->det_window, _("I/O port"),
+				      device->port, TRUE);
+	detail_window_append_info_int(mainwindow->det_window, _("IRQ"),
+				      device->irq, TRUE);
+	detail_window_append_info(mainwindow->det_window, "UART", device->uart);				      
 }