Makefile.am: Fix typo in 'ChangeLog' target.

[sigrok-gtk.git] / sigview.c

diff --git a/sigview.c b/sigview.c
index 4863e7fa8d19b2aff99fda8d5f7bb3743e35afc9..68886989846c5e146cb49e30fd3d973fc77d5e73 100644 (file)
--- a/sigview.c
+++ b/sigview.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <sigrok.h>
+#include <libsigrok/libsigrok.h>
 #include <gtk/gtk.h>
 
 #include <string.h>
@@ -30,14 +30,14 @@
 GtkListStore *siglist;
 
 static void format_func(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
-               GtkTreeModel *siglist, GtkTreeIter *iter, gpointer user_data)
+               GtkTreeModel *siglist, GtkTreeIter *iter, gpointer cb_data)
 {
        int probe;
        char *colour;
        GArray *data;
 
        (void)tree_column;
-       (void)user_data;
+       (void)cb_data;
 
        /* TODO: In future we will get data here from tree model.
         * PD data streams will be kept in the list.  The logic stream