Import Debian changes 0.3.7pre-1

hardinfo (0.3.7pre-1) unstable; urgency=low

  * New upstream release. (Closes: #280694, #300114, #233033)

1 files changed, 13 insertions, 49 deletions

diff --git a/isapnp.c b/isapnp.c
index 39163349..6fc7c8b3 100644
--- a/isapnp.c
+++ b/isapnp.c
@@ -28,7 +28,7 @@ ISADevice *hi_scan_isapnp(void)
 			gboolean lock = FALSE;
 			gfloat pnpversion, prodversion;
 			gint card_id;
-			gpointer start, end;
+			gpointer start = NULL, end = NULL;
 			
 			sscanf(buf, "Card %d", &card_id);
 			
@@ -41,7 +41,7 @@ ISADevice *hi_scan_isapnp(void)
 					lock = TRUE;
 				}
 			}
-			buf+=2;
+			buf += 2;
 			
 			sscanf(buf, "PnP version %f Product version %f", &pnpversion, &prodversion);
 			
@@ -70,61 +70,25 @@ ISADevice *hi_scan_isapnp(void)
 
 void hi_show_isa_info(MainWindow *mainwindow, ISADevice *device)
 {
-	GtkWidget *hbox, *vbox, *label;
 	gchar *buf;
-#ifdef GTK2
-	GtkWidget *pixmap;
-	
-	pixmap = gtk_image_new_from_file(IMG_PREFIX "pci.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), _("ISA Plug and Play Device"));
+	gtk_window_set_title(GTK_WINDOW(mainwindow->det_window->window), _("ISA Plug and Play Device"));
 	
-#ifdef GTK2
-	gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 0);
-#endif
+	detail_window_set_dev_name(mainwindow->det_window, device->card);
+	detail_window_set_icon(mainwindow->det_window, IMG_PREFIX "pci.png");
 
-	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->card);
-	label = gtk_label_new(buf);
-	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-	gtk_label_set_selectable(GTK_LABEL(label), TRUE);
-	
+	detail_window_append_info_int(mainwindow->det_window, _("Card ID"),
+				      device->card_id, FALSE);	
+	buf = g_strdup_printf("%.2f", device->pnpversion);
+	detail_window_append_info(mainwindow->det_window, _("PnP version"),
+				  buf);
 	g_free(buf);
-#else
-	label = gtk_label_new(device->card);
-#endif
-	gtk_widget_show(label);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	
-	buf = g_strdup_printf(_("Card ID: %d"), device->card_id);
-	label = gtk_label_new(buf);
-	gtk_widget_show(label);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-	g_free(buf);
-
-	buf = g_strdup_printf(_("PnP version: %.2f, Product version: %.2f"),
-			device->pnpversion, device->prodversion);
-	label = gtk_label_new(buf);
-	gtk_widget_show(label);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+	buf = g_strdup_printf("%.2f", device->prodversion);
+	detail_window_append_info(mainwindow->det_window, _("Product version"),
+				  buf);
 	g_free(buf);
 }