commit - 99f8222ce512794ae2883e6974b1394cd47bd68d
commit + cb550f104ae6a6230a56885cf3423ad366048c87
blob - bb031259086c9e171b41a5eca086265879601798
blob + 283c55070cc28b52ecc6143aa87240e658b3476d
--- siomixer.c
+++ siomixer.c
@@ -65,11 +65,11 @@ ondesc(void *arg, struct sioctl_desc *d, int curval)
 	if (d == NULL)
 		return;
 
-	n_items = g_list_model_get_n_items(G_LIST_MODEL(s.store));
+	n_items = g_list_model_get_n_items(G_LIST_MODEL(s.controls));
 	for (i = n_items - 1; i >= 0; i--) {
-		item = g_list_model_get_item(G_LIST_MODEL(s.store), i);
+		item = g_list_model_get_item(G_LIST_MODEL(s.controls), i);
 		if (d->addr == siomixer_ctl_item_get_addr(item))
-			g_list_store_remove(G_LIST_STORE(s.store), i);
+			g_list_store_remove(G_LIST_STORE(s.controls), i);
 	}
 
 	switch (d->type) {
@@ -78,9 +78,9 @@ ondesc(void *arg, struct sioctl_desc *d, int curval)
 		/*
 		 * find the right position to insert or merge ctl
 		 */
-		n_items = g_list_model_get_n_items(G_LIST_MODEL(s.store));
+		n_items = g_list_model_get_n_items(G_LIST_MODEL(s.controls));
 		for (i = 0; i < n_items; i++) {
-			item = g_list_model_get_item(G_LIST_MODEL(s.store), i);
+			item = g_list_model_get_item(G_LIST_MODEL(s.controls), i);
 			cmp = siomixer_ctl_item_cmpdesc(d, item);
 			if (cmp == 0) {
 				/* Update */
@@ -103,7 +103,7 @@ ondesc(void *arg, struct sioctl_desc *d, int curval)
 				g_error("should never happen\n");
 			}
 			item = siomixer_ctl_item_new(d);
-			g_list_store_insert(G_LIST_STORE(s.store), i, item);
+			g_list_store_insert(G_LIST_STORE(s.controls), i, item);
 
 			/* We want the object to get freed on list removal */
 			g_object_unref (item);
@@ -112,8 +112,8 @@ ondesc(void *arg, struct sioctl_desc *d, int curval)
 		break;
 	case SIOCTL_NONE:
 		if (item != NULL) {
-			g_list_store_remove(G_LIST_STORE(s.store), i);
-			n_items = g_list_model_get_n_items(G_LIST_MODEL(s.store));
+			g_list_store_remove(G_LIST_STORE(s.controls), i);
+			n_items = g_list_model_get_n_items(G_LIST_MODEL(s.controls));
 		}
 		break;
 	}
@@ -206,7 +206,7 @@ activate (GtkApplication *app, gpointer user_data)
 	gtk_window_set_default_size(GTK_WINDOW (window), -1, 400);
 
 	flowbox = gtk_flow_box_new();
-	gtk_flow_box_bind_model(GTK_FLOW_BOX(flowbox), G_LIST_MODEL(s.store),
+	gtk_flow_box_bind_model(GTK_FLOW_BOX(flowbox), G_LIST_MODEL(s.controls),
 	    siomixer_ctl_item_to_widget, NULL, NULL);
 	gtk_flow_box_set_selection_mode(GTK_FLOW_BOX(flowbox), GTK_SELECTION_NONE);
 
@@ -226,9 +226,9 @@ onctl(void *arg, unsigned addr, unsigned val)
 	SiomixerCtlItem *item = NULL;
 	unsigned i, n_items;
 
-	n_items = g_list_model_get_n_items(G_LIST_MODEL(s.store));
+	n_items = g_list_model_get_n_items(G_LIST_MODEL(s.controls));
 	for (i = 0; i < n_items; i++) {
-		item = g_list_model_get_item(G_LIST_MODEL(s.store), i);
+		item = g_list_model_get_item(G_LIST_MODEL(s.controls), i);
 		if (addr == siomixer_ctl_item_get_addr(item))
 			break;
 	}
@@ -271,7 +271,7 @@ main (int argc, char **argv)
 	if (s.hdl == NULL)
 		g_error("%s: can't open control device\n", devname);
 
-	s.store = g_list_store_new(SIOMIXER_TYPE_CTL_ITEM);
+	s.controls = g_list_store_new(SIOMIXER_TYPE_CTL_ITEM);
 
 	/* Initial state */
 	if (!sioctl_ondesc(s.hdl, ondesc, NULL))
blob - 4b6a2051133ce23efddf466905f234f18beeaf07
blob + b8cf9ebbd7c2ac7348ef83bcbe251e4a68c65c01
--- siomixer.h
+++ siomixer.h
@@ -21,5 +21,5 @@ struct app_state {
 	struct pollfd *pfds;
 	int nfds;
 	struct info *infolist;
-	GListStore *store;
+	GListStore *controls;
 };