X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=devselect.c;h=acdad5ce7abbe4c462c08d9af74a84635760de37;hb=a4f48bca49eb316be707abceda0ad964ddadc510;hp=950d94a338991b47b240b46b79ab2f2d46de6cc7;hpb=7f18eef108d073de5715bf84314cbdae2609d45b;p=sigrok-gtk.git

diff --git a/devselect.c b/devselect.c
index 950d94a..acdad5c 100644
--- a/devselect.c
+++ b/devselect.c
@@ -66,7 +66,7 @@ static void dev_menuitem_toggled(GtkMenuItem *item, GtkComboBox *combo)
 }
 
 #define GET_DEV_INST(dev) \
-	(dev)->plugin->get_dev_info((dev)->plugin_index, SR_DI_INST);
+	(dev)->driver->dev_info_get((dev)->driver_index, SR_DI_INST);
 
 void dev_select_rescan(GtkAction *action, GtkWindow *parent)
 {
@@ -91,8 +91,8 @@ void dev_select_rescan(GtkAction *action, GtkWindow *parent)
 	 */
 	if (gtk_combo_box_get_active_iter(devbox, &iter)) {
 		gtk_tree_model_get(GTK_TREE_MODEL(devlist), &iter, 1, &dev, -1);
-		/* FIXME: Use something other than dev->plugin->name */
-		sdevname = g_strdup(dev->plugin->name);
+		/* FIXME: Use something other than dev->driver->name */
+		sdevname = g_strdup(dev->driver->name);
 	}
 
 	/* Destroy the old menu items */
@@ -131,7 +131,7 @@ void dev_select_rescan(GtkAction *action, GtkWindow *parent)
 				2, menuitem,
 				-1);
 
-		if (sdevname && g_str_equal(sdevname, dev->plugin->name))
+		if (sdevname && g_str_equal(sdevname, dev->driver->name))
 			gtk_combo_box_set_active_iter(devbox, &iter);
 	}
 	if (sdevname)