1 files changed, 12 insertions, 12 deletions

diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c
index 9adfc296..fa30a363 100644
--- a/ui/cli/tap-funnel.c
+++ b/ui/cli/tap-funnel.c
@@ -25,13 +25,13 @@
 void register_tap_listener_funnel(void);
 
 struct _funnel_text_window_t {
-    gchar *title;
+    char *title;
     GString *text;
 };
 
-static GPtrArray *text_windows = NULL;
+static GPtrArray *text_windows;
 
-static funnel_text_window_t *new_text_window(funnel_ops_id_t *ops_id _U_, const gchar *title) {
+static funnel_text_window_t *new_text_window(funnel_ops_id_t *ops_id _U_, const char *title) {
     funnel_text_window_t *tw = g_new(funnel_text_window_t, 1);
     tw->title = g_strdup(title);
     tw->text = g_string_new("");
@@ -62,7 +62,7 @@ static void text_window_prepend(funnel_text_window_t *tw, const char *text) {
     g_string_prepend(tw->text, text);
 }
 
-static const gchar *text_window_get_text(funnel_text_window_t *tw) {
+static const char *text_window_get_text(funnel_text_window_t *tw) {
     return tw->text->str;
 }
 
@@ -107,7 +107,7 @@ void initialize_funnel_ops(void) {
 
 
 void funnel_dump_all_text_windows(void) {
-    guint i;
+    unsigned i;
 
     if (!text_windows) return;
 
@@ -125,16 +125,16 @@ void funnel_dump_all_text_windows(void) {
 
 #if 0
 
-GHashTable *menus = NULL;
+GHashTable *menus;
 typedef struct _menu_cb_t {
-    void (*callback)(gpointer);
+    void (*callback)(void *);
     void *callback_data;
 } menu_cb_t;
 
 
 static void  init_funnel_cmd(const char *opt_arg, void *data ) {
-    gchar **args = g_strsplit(opt_arg, ",", 0);
-    gchar **arg;
+    char **args = g_strsplit(opt_arg, ",", 0);
+    char **arg;
     menu_cb_t *mcb = data;
 
     for (arg = args; *arg ; arg++) {
@@ -149,9 +149,9 @@ static void  init_funnel_cmd(const char *opt_arg, void *data ) {
 
 static void register_menu_cb(const char *name,
                              register_stat_group_t group _U_,
-                             void (*callback)(gpointer),
-                             gpointer callback_data,
-                             gboolean retap _U_) {
+                             void (*callback)(void *),
+                             void *callback_data,
+                             bool retap _U_) {
     menu_cb_t* mcb = g_new(menu_cb_t, 1);
     stat_tap_ui ui_info;