Replace "gchar" with "char"

58 files changed, 201 insertions, 201 deletions

diff --git a/tests/listmodel.c b/tests/listmodel.c
index 8c3320842b..b4a2864dbf 100644
--- a/tests/listmodel.c
+++ b/tests/listmodel.c
@@ -13,7 +13,7 @@ typedef struct
 {
   GObject parent;
 
-  gchar *label;
+  char *label;
   int id;
 } MyObject;
 
@@ -132,7 +132,7 @@ add_some (GtkButton *button, GListStore *store)
   int n, i;
   guint n_items;
   GObject *obj;
-  gchar *label;
+  char *label;
 
   for (n = 0; n < 50; n++)
     {
@@ -178,7 +178,7 @@ main (int argc, char *argv[])
   for (i = 0; i < 100; i++)
     {
       MyObject *obj;
-      gchar *label;
+      char *label;
 
       label = g_strdup_printf ("item %d", i);
       obj = g_object_new (my_object_get_type (),
diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c
index c3b595bb74..35ad08e5fd 100644
--- a/tests/overlayscroll.c
+++ b/tests/overlayscroll.c
@@ -18,7 +18,7 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-static gchar *
+static char *
 get_content (void)
 {
   GString *s;
@@ -54,7 +54,7 @@ int
 main (int argc, char *argv[])
 {
   GtkWidget *window;
-  gchar *content;
+  char *content;
   GtkWidget *box;
   GtkWidget *sw;
   GtkWidget *tv;
diff --git a/tests/syncscroll.c b/tests/syncscroll.c
index d42fc9b8f5..5d724dca64 100644
--- a/tests/syncscroll.c
+++ b/tests/syncscroll.c
@@ -1,7 +1,7 @@
 #include <gtk/gtk.h>
 
 static void
-fill_text_view (GtkWidget *tv, const gchar *text)
+fill_text_view (GtkWidget *tv, const char *text)
 {
   int i;
   GString *s;
diff --git a/tests/testaccel.c b/tests/testaccel.c
index a74a081e40..3fde8a5d5e 100644
--- a/tests/testaccel.c
+++ b/tests/testaccel.c
@@ -117,7 +117,7 @@ key_test (void)
 }
 
 int
-main (int argc, gchar **argv)
+main (int argc, char **argv)
 {
   GtkWidget *dialog;
   
diff --git a/tests/testappchooser.c b/tests/testappchooser.c
index f398694d0e..f5abdde70c 100644
--- a/tests/testappchooser.c
+++ b/tests/testappchooser.c
@@ -34,7 +34,7 @@ dialog_response (GtkDialog *d,
                  gpointer   user_data)
 {
   GAppInfo *app_info;
-  const gchar *name;
+  const char *name;
 
   g_print ("Response: %d\n", response_id);
 
@@ -79,7 +79,7 @@ static void
 prepare_dialog (void)
 {
   gboolean use_file = FALSE;
-  gchar *content_type = NULL;
+  char *content_type = NULL;
 
   if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (radio_file)))
     use_file = TRUE;
@@ -183,7 +183,7 @@ int
 main (int argc, char **argv)
 {
   GtkWidget *w1;
-  gchar *path;
+  char *path;
   gboolean done = FALSE;
 
   gtk_init ();
diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c
index 1cc98923d9..9024b51dfa 100644
--- a/tests/testappchooserbutton.c
+++ b/tests/testappchooserbutton.c
@@ -45,7 +45,7 @@ combo_changed_cb (GtkAppChooserButton *chooser_button,
 
 static void
 special_item_activated_cb (GtkAppChooserButton *b,
-                           const gchar *item_name,
+                           const char *item_name,
                            gpointer user_data)
 {
   gtk_image_set_from_gicon (GTK_IMAGE (sel_image), g_themed_icon_new ("face-smile"));
@@ -54,7 +54,7 @@ special_item_activated_cb (GtkAppChooserButton *b,
 
 static void
 action_cb (GtkAppChooserButton *b,
-           const gchar *item_name,
+           const char *item_name,
            gpointer user_data)
 {
   g_print ("Activated custom item %s\n", item_name);
diff --git a/tests/testassistant.c b/tests/testassistant.c
index 00b1674d52..0d0d88259a 100644
--- a/tests/testassistant.c
+++ b/tests/testassistant.c
@@ -24,7 +24,7 @@
 #include <gtk/gtk.h>
 
 static GtkWidget*
-get_test_page (const gchar *text)
+get_test_page (const char *text)
 {
   return gtk_label_new (text);
 }
@@ -50,7 +50,7 @@ complete_cb (GtkWidget *check,
 	     
 static GtkWidget *
 add_completion_test_page (GtkWidget   *assistant,
-			  const gchar *text, 
+			  const char *text, 
 			  gboolean     visible,
 			  gboolean     complete)
 {
@@ -315,10 +315,10 @@ create_generous_assistant (GtkWidget *widget)
     }
 }
 
-static gchar selected_branch = 'A';
+static char selected_branch = 'A';
 
 static void
-select_branch (GtkWidget *widget, gchar branch)
+select_branch (GtkWidget *widget, char branch)
 {
   selected_branch = branch;
 }
@@ -572,7 +572,7 @@ static void
 flip_pages (GtkButton *button, GtkAssistant *assistant)
 {
   GtkWidget *page;
-  gchar *title;
+  char *title;
 
   page = gtk_assistant_get_nth_page (assistant, 1);
 
@@ -677,7 +677,7 @@ quit_cb (GtkWidget *widget,
 }
 
 int
-main (int argc, gchar *argv[])
+main (int argc, char *argv[])
 {
   GtkWidget *window, *box, *button;
   int i;
diff --git a/tests/testbaseline.c b/tests/testbaseline.c
index d5fe781876..32915a6972 100644
--- a/tests/testbaseline.c
+++ b/tests/testbaseline.c
@@ -61,7 +61,7 @@ image_size_value_changed (GtkSpinButton *spin_button,
 static void
 set_font_size (GtkWidget *widget, int size)
 {
-  const gchar *class[3] = { "small-font", "medium-font", "large-font" };
+  const char *class[3] = { "small-font", "medium-font", "large-font" };
 
   gtk_widget_add_css_class (widget, class[size]);
 }
diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index 2610a86688..d9f5722b1c 100644
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -67,7 +67,7 @@ static void
 calendar_set_signal_strings (char         *sig_str,
 				  CalendarData *data)
 {
-  const gchar *prev_sig;
+  const char *prev_sig;
 
   prev_sig = gtk_label_get_text (GTK_LABEL (data->prev_sig));
   gtk_label_set_text (GTK_LABEL (data->prev2_sig), prev_sig);
diff --git a/tests/testcellarea.c b/tests/testcellarea.c
index 6c66daa98a..c86eb75276 100644
--- a/tests/testcellarea.c
+++ b/tests/testcellarea.c
@@ -298,7 +298,7 @@ focus_list_model (void)
 
 static void
 cell_toggled (GtkCellRendererToggle *cell_renderer,
-	      const gchar           *path,
+	      const char            *path,
 	      GtkIconView      *iconview)
 {
   GtkTreeModel *model = gtk_icon_view_get_model (iconview);
@@ -316,8 +316,8 @@ cell_toggled (GtkCellRendererToggle *cell_renderer,
 
 static void
 cell_edited (GtkCellRendererToggle *cell_renderer,
-	     const gchar           *path,
-	     const gchar           *new_text,
+	     const char            *path,
+	     const char            *new_text,
 	     GtkIconView      *iconview)
 {
   GtkTreeModel *model = gtk_icon_view_get_model (iconview);
diff --git a/tests/testcolumnview.c b/tests/testcolumnview.c
index 51acea59ff..95d298c223 100644
--- a/tests/testcolumnview.c
+++ b/tests/testcolumnview.c
@@ -129,7 +129,7 @@ row_data_update_info (RowData   *data,
 static void
 copy_attribute (GFileInfo   *to,
                 GFileInfo   *from,
-                const gchar *attribute)
+                const char *attribute)
 {
   GFileAttributeType type;
   gpointer value;
diff --git a/tests/testcombo.c b/tests/testcombo.c
index fd1099c3df..21794045df 100644
--- a/tests/testcombo.c
+++ b/tests/testcombo.c
@@ -941,7 +941,7 @@ main (int argc, char **argv)
 	GtkTreePath *path;
 	GtkTreeIter iter;
 	GtkCellArea *area;
-        gchar *text;
+        char *text;
         int i;
         gboolean done = FALSE;
 
diff --git a/tests/testdialog.c b/tests/testdialog.c
index 75027b3c9b..660912cf00 100644
--- a/tests/testdialog.c
+++ b/tests/testdialog.c
@@ -202,7 +202,7 @@ my_dialog_init (MyDialog *dialog)
 static void
 my_dialog_class_init (MyDialogClass *class)
 {
-  gchar *buffer;
+  char *buffer;
   gsize size;
   GBytes *bytes;
 
@@ -271,7 +271,7 @@ my_dialog2_init (MyDialog2 *dialog)
 static void
 my_dialog2_class_init (MyDialog2Class *class)
 {
-  gchar *buffer;
+  char *buffer;
   gsize size;
   GBytes *bytes;
 
diff --git a/tests/testdnd2.c b/tests/testdnd2.c
index a393bd9393..591d12fe53 100644
--- a/tests/testdnd2.c
+++ b/tests/testdnd2.c
@@ -326,7 +326,7 @@ drag_cancel (GtkDragSource       *source,
 }
 
 static GtkWidget *
-make_image (const gchar *icon_name, int hotspot)
+make_image (const char *icon_name, int hotspot)
 {
   GtkWidget *image;
   GtkDragSource *source;
diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index 37473a6b79..a62b40978d 100644
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -157,11 +157,11 @@ create_completion_model (void)
 
 static gboolean
 match_func (GtkEntryCompletion *completion,
-	    const gchar        *key,
+	    const char         *key,
 	    GtkTreeIter        *iter,
 	    gpointer            user_data)
 {
-  gchar *item = NULL;
+  char *item = NULL;
   GtkTreeModel *model;
 
   gboolean ret = FALSE;
@@ -266,7 +266,7 @@ match_selected_cb (GtkEntryCompletion *completion,
 		   GtkTreeModel       *model,
 		   GtkTreeIter        *iter)
 {
-  gchar *str;
+  char *str;
   GtkWidget *entry;
 
   entry = gtk_entry_completion_get_entry (completion);
diff --git a/tests/testerrors.c b/tests/testerrors.c
index 6e92026160..ecdf3c2725 100644
--- a/tests/testerrors.c
+++ b/tests/testerrors.c
@@ -129,7 +129,7 @@ test_error_trapping (GdkDisplay *gdk_display)
 }
 
 int
-main (int argc, gchar *argv[])
+main (int argc, char *argv[])
 {
   GdkDisplay *gdk_display;
   GdkDisplay *extra_display;
diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c
index 01844b112c..239790c8af 100644
--- a/tests/testfilechooserbutton.c
+++ b/tests/testfilechooserbutton.c
@@ -39,7 +39,7 @@ static GOptionEntry entries[] = {
   { NULL }
 };
 
-static gchar *gtk_src_dir = NULL;
+static char *gtk_src_dir = NULL;
 
 static void
 print_selected_path_clicked_cb (GtkWidget *button,
@@ -165,8 +165,8 @@ chooser_selection_changed_cb (GtkFileChooser *chooser,
 }
 
 static void
-add_new_filechooser_button (const gchar          *mnemonic,
-                            const gchar          *chooser_title,
+add_new_filechooser_button (const char           *mnemonic,
+                            const char           *chooser_title,
                             GtkFileChooserAction  action,
                             GtkWidget            *group_box,
                             GtkSizeGroup         *label_group)
@@ -219,7 +219,7 @@ main (int   argc,
   GtkWidget *win, *vbox, *frame, *group_box;
   GtkSizeGroup *label_group;
   GOptionContext *context;
-  gchar *cwd;
+  char *cwd;
   gboolean done = FALSE;
 
   context = g_option_context_new ("- test GtkFileChooserButton widget");
diff --git a/tests/testflowbox.c b/tests/testflowbox.c
index 727e16708b..f2841bf301 100644
--- a/tests/testflowbox.c
+++ b/tests/testflowbox.c
@@ -44,7 +44,7 @@ populate_flowbox_simple (GtkFlowBox *flowbox)
 
   for (i = 0; i < N_ITEMS; i++)
     {
-      gchar *text = g_strdup_printf ("Item %02d", i);
+      char *text = g_strdup_printf ("Item %02d", i);
 
       widget = gtk_label_new (text);
       frame  = gtk_frame_new (NULL);
@@ -127,7 +127,7 @@ populate_flowbox_wrappy (GtkFlowBox *flowbox)
   GtkWidget *widget, *frame;
   int i;
 
-  const gchar *strings[] = {
+  const char *strings[] = {
     "These are", "some wrappy label", "texts", "of various", "lengths.",
     "They should always be", "shown", "consecutively. Except it's",
     "hard to say", "where exactly the", "label", "will wrap", "and where exactly",
@@ -160,7 +160,7 @@ populate_flowbox_images (GtkFlowBox *flowbox)
 
   for (i = 0; i < N_ITEMS; i++)
     {
-      gchar *text = g_strdup_printf ("Item %02d", i);
+      char *text = g_strdup_printf ("Item %02d", i);
 
       widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
       gtk_widget_set_hexpand (widget, TRUE);
@@ -343,10 +343,10 @@ sort_func (GtkFlowBoxChild *a,
            GtkFlowBoxChild *b,
            gpointer         data)
 {
-  gchar *ida, *idb;
+  char *ida, *idb;
 
-  ida = (gchar *)g_object_get_data (G_OBJECT (gtk_flow_box_child_get_child (a)), "id");
-  idb = (gchar *)g_object_get_data (G_OBJECT (gtk_flow_box_child_get_child (b)), "id");
+  ida = (char *)g_object_get_data (G_OBJECT (gtk_flow_box_child_get_child (a)), "id");
+  idb = (char *)g_object_get_data (G_OBJECT (gtk_flow_box_child_get_child (b)), "id");
   return g_strcmp0 (ida, idb);
 }
 
diff --git a/tests/testfontchooserdialog.c b/tests/testfontchooserdialog.c
index 7d3a88af0e..6b1f894b26 100644
--- a/tests/testfontchooserdialog.c
+++ b/tests/testfontchooserdialog.c
@@ -59,7 +59,7 @@ notify_preview_text_cb (GObject *fontchooser, GParamSpec *pspec, gpointer data)
 }
 
 static void
-font_activated_cb (GtkFontChooser *chooser, const gchar *font_name, gpointer data)
+font_activated_cb (GtkFontChooser *chooser, const char *font_name, gpointer data)
 {
   g_debug ("font-activated: %s", font_name);
 }
diff --git a/tests/testgmenu.c b/tests/testgmenu.c
index c4f9639139..0db92d6577 100644
--- a/tests/testgmenu.c
+++ b/tests/testgmenu.c
@@ -32,7 +32,7 @@
 
 /* The example menu {{{1 */
 
-static const gchar menu_markup[] =
+static const char menu_markup[] =
   "<interface>\n"
   "<menu id='edit-menu'>\n"
   "  <section>\n"
@@ -199,7 +199,7 @@ enabled_cell_func (GtkTreeViewColumn *column,
                    gpointer           data)
 {
   GActionGroup *group = data;
-  gchar *name;
+  char *name;
   gboolean enabled;
 
   gtk_tree_model_get (model, iter, 0, &name, -1);
@@ -217,7 +217,7 @@ state_cell_func (GtkTreeViewColumn *column,
                  gpointer           data)
 {
   GActionGroup *group = data;
-  gchar *name;
+  char *name;
   GVariant *state;
 
   gtk_tree_model_get (model, iter, 0, &name, -1);
@@ -251,12 +251,12 @@ state_cell_func (GtkTreeViewColumn *column,
 
 static void
 enabled_cell_toggled (GtkCellRendererToggle *cell,
-                      const gchar           *path_str,
+                      const char            *path_str,
                       GtkTreeModel          *model)
 {
   GActionGroup *group;
   GAction *action;
-  gchar *name;
+  char *name;
   GtkTreePath *path;
   GtkTreeIter iter;
   gboolean enabled;
@@ -278,12 +278,12 @@ enabled_cell_toggled (GtkCellRendererToggle *cell,
 
 static void
 state_cell_toggled (GtkCellRendererToggle *cell,
-                    const gchar           *path_str,
+                    const char            *path_str,
                     GtkTreeModel          *model)
 {
   GActionGroup *group;
   GAction *action;
-  gchar *name;
+  char *name;
   GtkTreePath *path;
   GtkTreeIter iter;
   GVariant *state;
@@ -317,13 +317,13 @@ state_cell_toggled (GtkCellRendererToggle *cell,
 
 static void
 state_cell_edited (GtkCellRendererCombo  *cell,
-                   const gchar           *path_str,
-                   const gchar           *new_text,
+                   const char            *path_str,
+                   const char            *new_text,
                    GtkTreeModel          *model)
 {
   GActionGroup *group;
   GAction *action;
-  gchar *name;
+  char *name;
   GtkTreePath *path;
   GtkTreeIter iter;
 
@@ -349,7 +349,7 @@ create_action_treeview (GActionGroup *group)
   GtkTreeIter iter;
   GtkTreeViewColumn *column;
   GtkCellRenderer *cell;
-  gchar **group_actions;
+  char **group_actions;
   int i;
 
   store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
@@ -438,7 +438,7 @@ toggle_sumerian (GtkToggleButton *button, gpointer data)
 
 static void
 action_list_add (GtkTreeModel *store,
-                 const gchar  *action)
+                 const char   *action)
 {
   GtkTreeIter iter;
 
@@ -448,10 +448,10 @@ action_list_add (GtkTreeModel *store,
 
 static void
 action_list_remove (GtkTreeModel *store,
-                    const gchar  *action)
+                    const char   *action)
 {
   GtkTreeIter iter;
-  gchar *text;
+  char *text;
 
   gtk_tree_model_get_iter_first (store, &iter);
   do {
diff --git a/tests/testgrid.c b/tests/testgrid.c
index 690b7eb94c..bb9a4ce829 100644
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -1,12 +1,12 @@
 #include <gtk/gtk.h>
 
 static GtkWidget *
-oriented_test_widget (const gchar *label, const gchar *color)
+oriented_test_widget (const char *label, const char *color)
 {
   GtkWidget *box;
   GtkWidget *widget;
   GtkCssProvider *provider;
-  gchar *data;
+  char *data;
 
   widget = gtk_label_new (label);
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
@@ -24,7 +24,7 @@ oriented_test_widget (const gchar *label, const gchar *color)
 }
 
 static GtkWidget *
-test_widget (const gchar *label, const gchar *color)
+test_widget (const char *label, const char *color)
 {
   return oriented_test_widget (label, color);
 }
@@ -277,7 +277,7 @@ scrolling (void)
 
   for (i = 1; i < 16; i++)
     {
-      gchar *color;
+      char *color;
       color = g_strdup_printf ("#%02x00%02x", 128 + 8*i, 128 - 8*i);
       child = test_widget (color, color);
       gtk_grid_attach (GTK_GRID (grid), child, 0, i, i + 1, 1);
@@ -287,7 +287,7 @@ scrolling (void)
 
   for (i = 1; i < 16; i++)
     {
-      gchar *color;
+      char *color;
       color = g_strdup_printf ("#%02x00%02x", 128 - 8*i, 128 + 8*i);
       child = oriented_test_widget (color, color);
       gtk_grid_attach (GTK_GRID (grid), child, i, 0, 1, i);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 674274908e..310f59ab71 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -632,7 +632,7 @@ static void
 statusbar_push (GtkWidget *button,
 		GtkStatusbar *statusbar)
 {
-  gchar text[1024];
+  char text[1024];
 
   sprintf (text, "something %d", statusbar_counter++);
 
@@ -643,7 +643,7 @@ static void
 statusbar_push_long (GtkWidget *button,
                      GtkStatusbar *statusbar)
 {
-  gchar text[1024];
+  char text[1024];
 
   sprintf (text, "Just because a system has menu choices written with English words, phrases or sentences, that is no guarantee, that it is comprehensible. Individual words may not be familiar to some users (for example, \"repaginate\"), and two menu items may appear to satisfy the users's needs, whereas only one does (for example, \"put away\" or \"eject\").");
 
@@ -667,7 +667,7 @@ statusbar_steal (GtkWidget *button,
 static void
 statusbar_popped (GtkStatusbar  *statusbar,
 		  guint          context_id,
-		  const gchar	*text)
+		  const char	*text)
 {
   if (!text)
     statusbar_counter = 1;
@@ -867,7 +867,7 @@ create_selectable_control (GtkWidget *widget)
 static void
 dialog_response (GtkWidget *dialog, int response_id, GtkLabel *label)
 {
-  const gchar *text;
+  const char *text;
 
   gtk_window_destroy (GTK_WINDOW (dialog));
 
@@ -879,7 +879,7 @@ dialog_response (GtkWidget *dialog, int response_id, GtkLabel *label)
 }
 
 static gboolean
-activate_link (GtkWidget *label, const gchar *uri, gpointer data)
+activate_link (GtkWidget *label, const char *uri, gpointer data)
 {
   if (g_strcmp0 (uri, "keynav") == 0)
     {
@@ -1079,7 +1079,7 @@ on_rotated_text_draw (GtkDrawingArea *drawing_area,
                       int             height,
                       gpointer        tile_pixbuf)
 {
-  static const gchar *words[] = { "The", "grand", "old", "Duke", "of", "York",
+  static const char *words[] = { "The", "grand", "old", "Duke", "of", "York",
                                   "had", "10,000", "men" };
   int n_words;
   int i;
@@ -1362,7 +1362,7 @@ create_tooltips (GtkWidget *widget)
 
 static void
 pack_image (GtkWidget *box,
-            const gchar *text,
+            const char *text,
             GtkWidget *image)
 {
   gtk_box_append (GTK_BOX (box),
@@ -1578,8 +1578,8 @@ create_listbox (GtkWidget *widget)
 
 
 static GtkWidget *
-accel_button_new (const gchar *text,
-                  const gchar *accel)
+accel_button_new (const char *text,
+                  const char *accel)
 {
   guint keyval;
   GdkModifierType modifiers;
@@ -2424,7 +2424,7 @@ change_digits (GtkWidget *widget, GtkSpinButton *spin)
 static void
 get_value (GtkWidget *widget, gpointer data)
 {
-  gchar buf[32];
+  char buf[32];
   GtkLabel *label;
   GtkSpinButton *spin;
 
@@ -2443,7 +2443,7 @@ get_value (GtkWidget *widget, gpointer data)
 static void
 get_spin_value (GtkWidget *widget, gpointer data)
 {
-  gchar *buffer;
+  char *buffer;
   GtkLabel *label;
   GtkSpinButton *spin;
 
@@ -2462,7 +2462,7 @@ static int
 spin_button_time_output_func (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
-  static gchar buf[6];
+  static char buf[6];
   gdouble hours;
   gdouble minutes;
 
@@ -2483,7 +2483,7 @@ spin_button_month_input_func (GtkSpinButton *spin_button,
   static const char *month[12] = { "January", "February", "March", "April",
 			      "May", "June", "July", "August",
 			      "September", "October", "November", "December" };
-  gchar *tmp1, *tmp2;
+  char *tmp1, *tmp2;
   gboolean found = FALSE;
 
   for (i = 1; i <= 12; i++)
@@ -2531,8 +2531,8 @@ static int
 spin_button_hex_input_func (GtkSpinButton *spin_button,
 			    gdouble       *new_val)
 {
-  const gchar *buf;
-  gchar *err;
+  const char *buf;
+  char *err;
   gdouble res;
 
   buf = gtk_editable_get_text (GTK_EDITABLE (spin_button));
@@ -2548,7 +2548,7 @@ static int
 spin_button_hex_output_func (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
-  static gchar buf[7];
+  static char buf[7];
   gdouble val;
 
   adjustment = gtk_spin_button_get_adjustment (spin_button);
@@ -2811,7 +2811,7 @@ cursor_draw (GtkDrawingArea *darea,
   cairo_fill (cr);
 }
 
-static const gchar *cursor_names[] = {
+static const char *cursor_names[] = {
   "none",
   "default",
   "help",
@@ -2871,14 +2871,14 @@ cursor_pressed_cb (GtkGesture *gesture,
                    GtkWidget  *entry)
 {
   GtkWidget *widget;
-  const gchar *name;
+  const char *name;
   int i;
   const int n = G_N_ELEMENTS (cursor_names);
   int button;
 
   widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
 
-  name = (const gchar *)g_object_get_data (G_OBJECT (widget), "name");
+  name = (const char *)g_object_get_data (G_OBJECT (widget), "name");
   if (name != NULL)
     {
       for (i = 0; i < n; i++)
@@ -2901,7 +2901,7 @@ static void
 set_cursor_from_name (GtkWidget *entry,
                       GtkWidget *widget)
 {
-  const gchar *name;
+  const char *name;
 
   name = gtk_editable_get_text (GTK_EDITABLE (entry));
   gtk_widget_set_cursor_from_name (widget, name);
@@ -2921,7 +2921,7 @@ change_cursor_theme (GtkWidget *widget,
                      gpointer   data)
 {
 #if defined(GDK_WINDOWING_X11) || defined (GDK_WINDOWING_WAYLAND)
-  const gchar *theme;
+  const char *theme;
   int size;
   GdkDisplay *display;
   GtkWidget *entry;
@@ -3395,7 +3395,7 @@ typedef struct
 static void
 screen_display_check (GtkWidget *widget, ScreenDisplaySelection *data)
 {
-  const gchar *display_name;
+  const char *display_name;
   GdkDisplay *display;
   GtkWidget *dialog;
   GdkDisplay *new_display = NULL;
@@ -3426,7 +3426,7 @@ screen_display_check (GtkWidget *widget, ScreenDisplaySelection *data)
       gboolean found = FALSE;
       while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i++))
         {
-          gchar *name;
+          char *name;
           gtk_tree_model_get (model, &iter, 0, &name, -1);
           found = !g_ascii_strcasecmp (display_name, name);
           g_free (name);
@@ -3514,7 +3514,7 @@ create_display_screen (GtkWidget *widget)
  * GtkRange
  */
 
-static gchar*
+static char *
 reformat_value (GtkScale *scale,
                 gdouble   value)
 {
@@ -4021,9 +4021,9 @@ toggle_shrink (GtkWidget *widget, GtkWidget *child)
 
 static GtkWidget *
 create_pane_options (GtkPaned    *paned,
-		     const gchar *frame_label,
-		     const gchar *label1,
-		     const gchar *label2)
+		     const char *frame_label,
+		     const char *label1,
+		     const char *label2)
 {
   GtkWidget *child1, *child2;
   GtkWidget *frame;
@@ -4627,7 +4627,7 @@ surface_state_callback (GdkSurface  *window,
                        GParamSpec *pspec,
                        GtkWidget  *label)
 {
-  gchar *msg;
+  char *msg;
   GdkSurfaceState new_state;
 
   new_state = gdk_toplevel_get_state (GDK_TOPLEVEL (window));
@@ -5116,7 +5116,7 @@ progress_timeout (gpointer data)
 {
   ProgressData *pdata = data;
   gdouble new_val;
-  gchar *text;
+  char *text;
 
   if (pdata->activity)
     {
@@ -5919,7 +5919,7 @@ create_main_window (void)
   GtkWidget *scrolled_window;
   GtkWidget *button;
   GtkWidget *label;
-  gchar buffer[64];
+  char buffer[64];
   GtkWidget *separator;
   int i;
 
diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c
index d9b1760057..b2a63c459b 100644
--- a/tests/testheaderbar.c
+++ b/tests/testheaderbar.c
@@ -218,8 +218,8 @@ split_decorations (GtkSettings *settings,
                    GtkBuilder  *builder)
 {
   GtkWidget *sheader, *mheader;
-  gchar *layout, *p1, *p2;
-  gchar **p;
+  char *layout, *p1, *p2;
+  char **p;
 
   sheader = (GtkWidget *)gtk_builder_get_object (builder, "sidebar-header");
   mheader = (GtkWidget *)gtk_builder_get_object (builder, "main-header");
@@ -359,7 +359,7 @@ create_stacked_headerbar (GtkApplication *app)
 
 /* technorama */
 
-static const gchar css[] =
+static const char css[] =
  ".main.background { "
  " background-image: linear-gradient(to bottom, red, blue);"
  " border-width: 0px; "
@@ -505,7 +505,7 @@ create_technorama (GtkApplication *app)
 }
 
 struct {
-  const gchar *name;
+  const char *name;
   void (*cb) (GtkApplication *app);
 } buttons[] =
 {
diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index 063a916f5b..d7233ddcaf 100644
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -21,9 +21,9 @@
 #include <gtk/gtk.h>
 
 typedef struct {
-  const gchar *name;
-  const gchar *tooltip;
-  const gchar *interface;
+  const char *name;
+  const char *tooltip;
+  const char *interface;
   GtkWidget   *window;
 } TestInterface;
 
diff --git a/tests/testiconview.c b/tests/testiconview.c
index a09aba44f9..b0f8808cf5 100644
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -131,7 +131,7 @@ add_n_items (GtkIconView *icon_list, int n)
   GtkTreeIter iter;
   GtkListStore *store;
   GdkPixbuf *pixbuf;
-  gchar *str, *str2;
+  char *str, *str2;
   int i;
 
   store = GTK_LIST_STORE (gtk_icon_view_get_model (icon_list));
@@ -174,7 +174,7 @@ add_large (GtkWidget *button, GtkIconView *icon_list)
   GtkTreeIter iter;
 
   GdkPixbuf *pixbuf, *pb;
-  gchar *str;
+  char *str;
 
   store = GTK_LIST_STORE (gtk_icon_view_get_model (icon_list));
   pixbuf = gdk_pixbuf_new_from_file ("gnome-textfile.png", NULL);
@@ -275,7 +275,7 @@ item_activated (GtkIconView *icon_view,
 {
   GtkTreeIter iter;
   GtkTreeModel *model;
-  gchar *text;
+  char *text;
 
   model = gtk_icon_view_get_model (icon_view);
   gtk_tree_model_get_iter (model, &iter, path);
@@ -288,7 +288,7 @@ item_activated (GtkIconView *icon_view,
 
 static void
 toggled (GtkCellRendererToggle *cell,
-	 gchar                 *path_string,
+	 char                  *path_string,
 	 gpointer               data)
 {
   GtkTreeModel *model = GTK_TREE_MODEL (data);
@@ -307,8 +307,8 @@ toggled (GtkCellRendererToggle *cell,
 
 static void
 edited (GtkCellRendererText *cell,
-	gchar               *path_string,
-	gchar               *new_text,
+	char                *path_string,
+	char                *new_text,
 	gpointer             data)
 {
   GtkTreeModel *model = GTK_TREE_MODEL (data);
@@ -391,7 +391,7 @@ popup_menu_handler (GtkWidget *widget)
 }
 
 int
-main (int argc, gchar **argv)
+main (int argc, char **argv)
 {
   GtkWidget *paned, *tv;
   GtkWidget *window, *icon_list, *scrolled_window;
diff --git a/tests/testkineticscrolling.c b/tests/testkineticscrolling.c
index be9d49f640..1189cc9d14 100644
--- a/tests/testkineticscrolling.c
+++ b/tests/testkineticscrolling.c
@@ -93,7 +93,7 @@ kinetic_scrolling (void)
   for (i = 0; i < 80; i++)
     {
       GtkTreeIter iter;
-      gchar *iter_label = g_strdup_printf ("Row number %d", i);
+      char *iter_label = g_strdup_printf ("Row number %d", i);
 
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter, 0, iter_label, -1);
diff --git a/tests/testlevelbar.c b/tests/testlevelbar.c
index 5a79ec66ef..242aa727dd 100644
--- a/tests/testlevelbar.c
+++ b/tests/testlevelbar.c
@@ -28,7 +28,7 @@ static void
 add_custom_css (void)
 {
   GtkCssProvider *provider;
-  const gchar data[] =
+  const char data[] =
   "levelbar block.my-offset {"
   "   background: magenta;"
   "}";
diff --git a/tests/testlist.c b/tests/testlist.c
index 25579739be..285aaa74da 100644
--- a/tests/testlist.c
+++ b/tests/testlist.c
@@ -44,7 +44,7 @@ row_class_init (RowClass *class)
 }
 
 static GtkWidget *
-row_new (const gchar* text, int sort_id) {
+row_new (const char * text, int sort_id) {
   Row *row;
 
   row = g_object_new (row_get_type (), NULL);
diff --git a/tests/testlist2.c b/tests/testlist2.c
index e9465f63bd..0a43faf29e 100644
--- a/tests/testlist2.c
+++ b/tests/testlist2.c
@@ -29,7 +29,7 @@ remove_this_row (GtkButton *button, GtkWidget *child)
   gtk_revealer_set_reveal_child (GTK_REVEALER (revealer), FALSE);
 }
 
-static GtkWidget *create_row (const gchar *label);
+static GtkWidget *create_row (const char *label);
 
 static void
 row_revealed (GObject *revealer, GParamSpec *pspec, gpointer data)
@@ -74,7 +74,7 @@ add_separator (GtkListBoxRow *row, GtkListBoxRow *before, gpointer data)
 }
 
 static GtkWidget *
-create_row (const gchar *text)
+create_row (const char *text)
 {
   GtkWidget *row, *label, *button;
 
@@ -110,7 +110,7 @@ int main (int argc, char *argv[])
 {
   GtkWidget *window, *list, *sw, *row;
   int i;
-  gchar *text;
+  char *text;
   gboolean done = FALSE;
 
   gtk_init ();
diff --git a/tests/testlist3.c b/tests/testlist3.c
index a800f3b9f3..db238f1829 100644
--- a/tests/testlist3.c
+++ b/tests/testlist3.c
@@ -57,7 +57,7 @@ drag_drop (GtkDropTarget *dest,
 }
 
 static GtkWidget *
-create_row (const gchar *text)
+create_row (const char *text)
 {
   GtkWidget *row, *box, *label, *image;
   GtkDragSource *source;
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
   GtkWidget *window, *list, *sw, *row;
   GtkWidget *hbox, *vbox, *combo, *button;
   int i;
-  gchar *text;
+  char *text;
   GtkCssProvider *provider;
 
   gtk_init ();
diff --git a/tests/testlist4.c b/tests/testlist4.c
index e7bbf3ed5b..5bf7910ff0 100644
--- a/tests/testlist4.c
+++ b/tests/testlist4.c
@@ -10,14 +10,14 @@ typedef GtkApplicationClass TestAppClass;
 static GType test_app_get_type (void);
 G_DEFINE_TYPE (TestApp, test_app, GTK_TYPE_APPLICATION)
 
-static GtkWidget *create_row (const gchar *label);
+static GtkWidget *create_row (const char *label);
 
 static void
 activate_first_row (GSimpleAction *simple,
                     GVariant      *parameter,
                     gpointer       user_data)
 {
-  const gchar *text = "First row activated (no parameter action)";
+  const char *text = "First row activated (no parameter action)";
 
   g_print ("%s\n", text);
   gtk_label_set_label (GTK_LABEL (user_data), text);
@@ -28,7 +28,7 @@ activate_print_string (GSimpleAction *simple,
                        GVariant      *parameter,
                        gpointer       user_data)
 {
-  const gchar *text = g_variant_get_string (parameter, NULL);
+  const char *text = g_variant_get_string (parameter, NULL);
 
   g_print ("%s\n", text);
   gtk_label_set_label (GTK_LABEL (user_data), text);
@@ -40,7 +40,7 @@ activate_print_int (GSimpleAction *simple,
                     gpointer       user_data)
 {
   const int value = g_variant_get_int32 (parameter);
-  gchar *text;
+  char *text;
 
   text = g_strdup_printf ("Row %d activated (int action)", value);
 
@@ -54,7 +54,7 @@ row_without_gaction_activated_cb (GtkListBox    *list,
                                   gpointer       user_data)
 {
   int index = gtk_list_box_row_get_index (row);
-  gchar *text;
+  char *text;
 
   text = g_strdup_printf ("Row %d activated (signal based)", index);
 
@@ -72,7 +72,7 @@ add_separator (GtkListBoxRow *row, GtkListBoxRow *before, gpointer data)
 }
 
 static GtkWidget *
-create_row (const gchar *text)
+create_row (const char *text)
 {
   GtkWidget *row_content, *label;
 
@@ -94,7 +94,7 @@ new_window (GApplication *app)
   GtkListBoxRow *row;
 
   int i;
-  gchar *text, *text2;
+  char *text, *text2;
 
   window = gtk_application_window_new (GTK_APPLICATION (app));
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
diff --git a/tests/testlistview.c b/tests/testlistview.c
index 6e82bdff9b..54cbfb5506 100644
--- a/tests/testlistview.c
+++ b/tests/testlistview.c
@@ -391,7 +391,7 @@ row_data_update_info (RowData   *data,
 static void
 copy_attribute (GFileInfo   *to,
                 GFileInfo   *from,
-                const gchar *attribute)
+                const char *attribute)
 {
   GFileAttributeType type;
   gpointer value;
diff --git a/tests/testlogout.c b/tests/testlogout.c
index 39a38b2b3a..67788debde 100644
--- a/tests/testlogout.c
+++ b/tests/testlogout.c
@@ -12,7 +12,7 @@ static void
 inhibitor_toggled (GtkToggleButton *button, GtkApplication *app)
 {
   gboolean active;
-  const gchar *reason;
+  const char *reason;
   GtkApplicationInhibitFlags flags;
   GtkWidget *toplevel;
   guint cookie;
@@ -34,7 +34,7 @@ inhibitor_toggled (GtkToggleButton *button, GtkApplication *app)
 
   if (active)
     {
-      gchar *text;
+      char *text;
 
       g_print ("Calling gtk_application_inhibit: %d, '%s'\n", flags, reason);
 
diff --git a/tests/testnotebookdnd.c b/tests/testnotebookdnd.c
index 3858aa6383..5bb1ce4458 100644
--- a/tests/testnotebookdnd.c
+++ b/tests/testnotebookdnd.c
@@ -175,7 +175,7 @@ create_notebook (const char     **labels,
 
 static GtkWidget*
 create_notebook_non_dragable_content (const char      **labels,
-                                      const gchar      *group,
+                                      const char       *group,
                                       GtkPositionType   pos)
 {
   GtkWidget *notebook, *title, *page, *action_widget;
@@ -226,7 +226,7 @@ create_notebook_non_dragable_content (const char      **labels,
 
 static GtkWidget*
 create_notebook_with_notebooks (const char      **labels,
-                                const gchar      *group,
+                                const char       *group,
                                 GtkPositionType   pos)
 {
   GtkWidget *notebook, *title, *page;
@@ -287,7 +287,7 @@ quit_cb (GtkWidget *widget,
 }
 
 int
-main (int argc, gchar *argv[])
+main (int argc, char *argv[])
 {
   GtkWidget *window, *grid;
   gboolean done = FALSE;
diff --git a/tests/testoverlay.c b/tests/testoverlay.c
index 7c175cfbbe..00be3026e7 100644
--- a/tests/testoverlay.c
+++ b/tests/testoverlay.c
@@ -220,7 +220,7 @@ test_scrolling (void)
   GtkWidget *text;
   GtkWidget *child;
   GtkTextBuffer *buffer;
-  gchar *contents;
+  char *contents;
   gsize len;
 
   win = gtk_window_new ();
@@ -261,7 +261,7 @@ test_scrolling (void)
   return win;
 }
 
-static const gchar *buffer =
+static const char *buffer =
 "<interface>"
 "  <object class='GtkWindow' id='window'>"
 "    <property name='title'>GtkBuilder support</property>"
@@ -368,7 +368,7 @@ test_chase (void)
   GtkWidget *text;
   GtkWidget *child;
   GtkTextBuffer *text_buffer;
-  gchar *contents;
+  char *contents;
   gsize len;
   GtkEventController *controller;
 
diff --git a/tests/testoverlaystyleclass.c b/tests/testoverlaystyleclass.c
index 47032021c7..51c24ca7b1 100644
--- a/tests/testoverlaystyleclass.c
+++ b/tests/testoverlaystyleclass.c
@@ -27,7 +27,7 @@ main (int argc, char *argv[])
 {
   GtkWidget *win, *overlay, *grid, *main_child, *child, *label, *sw;
   GtkCssProvider *provider;
-  gchar *str;
+  char *str;
 
   gtk_init ();
 
diff --git a/tests/testperf.c b/tests/testperf.c
index 27b9d623aa..c674516241 100644
--- a/tests/testperf.c
+++ b/tests/testperf.c
@@ -69,7 +69,7 @@ main (int argc, char *argv[])
       GSubprocessLauncher *launcher;
       GSubprocess *subprocess;
       int fd;
-      gchar *name;
+      char *name;
       SysprofCaptureReader *reader;
       SysprofCaptureCursor *cursor;
       SysprofCaptureCondition *condition;
diff --git a/tests/testrc.c b/tests/testrc.c
index 91d979bfc1..ce1b882977 100644
--- a/tests/testrc.c
+++ b/tests/testrc.c
@@ -24,8 +24,8 @@
  * the _-prefix stripping.
  */
 struct {
-  gchar    *pattern;
-  gchar    *test;
+  char     *pattern;
+  char     *test;
   gboolean  match;
 } tests[] = {
   { "", "", TRUE },
@@ -58,7 +58,7 @@ main (int argc, char *argv[])
   for (i = 0; tests[i].test; i++)
     {
       GSList *list;
-      gchar *path, *rpath;
+      char *path, *rpath;
       gboolean result;
       
       list = _gtk_rc_parse_widget_class_path (tests[i].pattern);
diff --git a/tests/testrevealer.c b/tests/testrevealer.c
index 9ec28b3caa..0a97193587 100644
--- a/tests/testrevealer.c
+++ b/tests/testrevealer.c
@@ -2,7 +2,7 @@
 
 int
 main (int argc,
-      gchar ** argv)
+      char ** argv)
 {
   GtkWidget *window, *revealer, *box, *widget, *entry;
 
diff --git a/tests/testscale.c b/tests/testscale.c
index 86e9b47da2..277a837e4b 100644
--- a/tests/testscale.c
+++ b/tests/testscale.c
@@ -108,14 +108,14 @@ int main (int argc, char *argv[])
   GtkWidget *button;
   GtkWidget *frame;
   GtkWidget *scale;
-  const gchar *labels[3] = {
+  const char *labels[3] = {
     "<small>Left</small>",
     "<small>Middle</small>",
     "<small>Right</small>"
   };
 
   gdouble bath_marks[4] = { 0.0, 33.3, 66.6, 100.0 };
-  const gchar *bath_labels[4] = {
+  const char *bath_labels[4] = {
     "<span color='blue' size='small'>Cold</span>",
     "<span size='small'>Baby bath</span>",
     "<span size='small'>Hot tub</span>",
@@ -123,7 +123,7 @@ int main (int argc, char *argv[])
   };
 
   gdouble pos_marks[4] = { 0.0, 33.3, 66.6, 100.0 };
-  const gchar *pos_labels[4] = { "Left", "Right", "Top", "Bottom" };
+  const char *pos_labels[4] = { "Left", "Right", "Top", "Bottom" };
   gboolean done = FALSE;
 
   gtk_init ();
diff --git a/tests/testscrolledge.c b/tests/testscrolledge.c
index 94f808f7e8..5661202d1a 100644
--- a/tests/testscrolledge.c
+++ b/tests/testscrolledge.c
@@ -24,7 +24,7 @@ static void
 populate_list (GtkListBox *list)
 {
   int i;
-  gchar *text;
+  char *text;
   GtkWidget *row, *label;
   int n;
   GtkWidget *child;
diff --git a/tests/testselectionmode.c b/tests/testselectionmode.c
index 325e80b2f0..b001e253c5 100644
--- a/tests/testselectionmode.c
+++ b/tests/testselectionmode.c
@@ -82,7 +82,7 @@ add_row (GtkWidget *list, int i)
 {
   GtkWidget *row;
   GtkWidget *label;
-  gchar *text;
+  char *text;
 
   row = selectable_row_new ();
   text = g_strdup_printf ("Docker %d", i);
diff --git a/tests/testsensitive.c b/tests/testsensitive.c
index 88eccfb1b5..e53d80049d 100644
--- a/tests/testsensitive.c
+++ b/tests/testsensitive.c
@@ -10,7 +10,7 @@ static void
 state_flags_changed (GtkWidget *widget)
 {
   GtkStateFlags flags;
-  const gchar *sep;
+  const char *sep;
 
   g_print ("state changed: \n");
 
diff --git a/tests/teststack.c b/tests/teststack.c
index 571d58fc07..70931fa20f 100644
--- a/tests/teststack.c
+++ b/tests/teststack.c
@@ -51,8 +51,8 @@ toggle_transitions (GtkWidget *combo, gpointer data)
 static void
 on_back_button_clicked (GtkButton *button, gpointer user_data)
 {
-  const gchar *seq[] = { "1", "2", "3" };
-  const gchar *vis;
+  const char *seq[] = { "1", "2", "3" };
+  const char *vis;
   int i;
 
   vis = gtk_stack_get_visible_child_name (GTK_STACK (stack));
@@ -70,8 +70,8 @@ on_back_button_clicked (GtkButton *button, gpointer user_data)
 static void
 on_forward_button_clicked (GtkButton *button, gpointer user_data)
 {
-  const gchar *seq[] = { "1", "2", "3" };
-  const gchar *vis;
+  const char *seq[] = { "1", "2", "3" };
+  const char *vis;
   int i;
 
   vis = gtk_stack_get_visible_child_name (GTK_STACK (stack));
@@ -89,7 +89,7 @@ on_forward_button_clicked (GtkButton *button, gpointer user_data)
 static void
 update_back_button_sensitivity (GtkStack *_stack, GParamSpec *pspec, GtkWidget *button)
 {
-  const gchar *vis;
+  const char *vis;
 
   vis = gtk_stack_get_visible_child_name (GTK_STACK (stack));
   gtk_widget_set_sensitive (button, g_strcmp0 (vis, "1") != 0);
@@ -98,7 +98,7 @@ update_back_button_sensitivity (GtkStack *_stack, GParamSpec *pspec, GtkWidget *
 static void
 update_forward_button_sensitivity (GtkStack *_stack, GParamSpec *pspec, GtkWidget *button)
 {
-  const gchar *vis;
+  const char *vis;
 
   vis = gtk_stack_get_visible_child_name (GTK_STACK (stack));
   gtk_widget_set_sensitive (button, g_strcmp0 (vis, "3") != 0);
@@ -106,7 +106,7 @@ update_forward_button_sensitivity (GtkStack *_stack, GParamSpec *pspec, GtkWidge
 
 int
 main (int argc,
-      gchar ** argv)
+      char ** argv)
 {
   GtkWidget *window, *box, *button, *hbox, *combo, *layout;
   GtkWidget *w2, *w3;
diff --git a/tests/testtexthistory.c b/tests/testtexthistory.c
index fddc86daf5..556b2ac45f 100644
--- a/tests/testtexthistory.c
+++ b/tests/testtexthistory.c
@@ -93,7 +93,7 @@ static void
 do_delete (gpointer     funcs_data,
            guint        begin,
            guint        end,
-           const gchar *expected_text,
+           const char *expected_text,
            guint        len)
 {
   Text *t = funcs_data;
diff --git a/tests/testtooltips.c b/tests/testtooltips.c
index a955d56dd5..6f6b951d24 100644
--- a/tests/testtooltips.c
+++ b/tests/testtooltips.c
@@ -120,8 +120,8 @@ query_tooltip_tree_view_cb (GtkWidget  *widget,
   GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
   GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
   GtkTreePath *path = NULL;
-  gchar *tmp;
-  gchar *pathstring;
+  char *tmp;
+  char *pathstring;
 
   char buffer[512];
 
diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index 768418d315..b67e318d4d 100644
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -511,7 +511,7 @@ add_clicked (GtkWidget *button, gpointer data)
   GtkTreeViewColumn *column;
   GtkTreeSelection *selection;
   GtkCellRenderer *cell;
-  gchar *label = g_strdup_printf ("Column %d", i);
+  char *label = g_strdup_printf ("Column %d", i);
 
   cell = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes (label, cell, "text", 0, NULL);
@@ -546,7 +546,7 @@ get_visible (GtkTreeViewColumn *tree_column,
 
 static void
 set_visible (GtkCellRendererToggle *cell,
-	     gchar                 *path_str,
+	     char                  *path_str,
 	     gpointer               data)
 {
   GtkTreeView *tree_view = (GtkTreeView *) data;
@@ -576,7 +576,7 @@ move_to_left (GtkTreeModel *src,
   GtkTreeIter iter;
   GtkTreeViewColumn *column;
   GtkTreeSelection *selection;
-  gchar *label;
+  char *label;
 
   gtk_tree_model_get (src, src_iter, 0, &label, 1, &column, -1);
 
@@ -606,7 +606,7 @@ move_to_right (GtkTreeIter  *src_iter,
 	       GtkTreeModel *dest,
 	       GtkTreeIter  *dest_iter)
 {
-  gchar *label;
+  char *label;
   GtkTreeViewColumn *column;
   int before = -1;
 
@@ -636,7 +636,7 @@ move_up_or_down (GtkTreeModel *src,
 		 GtkTreeIter  *dest_iter)
 {
   GtkTreeViewColumn *column;
-  gchar *label;
+  char *label;
   int before = -1;
   
   gtk_tree_model_get (src, src_iter, 0, &label, 1, &column, -1);
@@ -750,7 +750,7 @@ main (int argc, char *argv[])
   for (i = 0; i < 10; i++)
     {
       GtkTreeIter iter;
-      gchar *string = g_strdup_printf ("%d", i);
+      char *string = g_strdup_printf ("%d", i);
       gtk_list_store_append (GTK_LIST_STORE (sample_model), &iter);
       gtk_list_store_set (GTK_LIST_STORE (sample_model), &iter, 0, string, -1);
       g_free (string);
diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c
index a2932f48ea..d0c0c23a92 100644
--- a/tests/testtreecolumnsizing.c
+++ b/tests/testtreecolumnsizing.c
@@ -48,7 +48,7 @@ create_model (void)
 
   for (i = 0; i < N_ROWS; i++)
     {
-      gchar *str;
+      char *str;
 
       str = g_strdup_printf ("Row %d", i);
       gtk_list_store_insert_with_values (store, NULL, i,
@@ -94,7 +94,7 @@ static void
 combo_box_changed (GtkComboBox *combo_box,
                    gpointer     user_data)
 {
-  gchar *str;
+  char *str;
   GList *list;
   GList *columns;
 
diff --git a/tests/testtreednd.c b/tests/testtreednd.c
index 736b071c9a..d219173f40 100644
--- a/tests/testtreednd.c
+++ b/tests/testtreednd.c
@@ -29,7 +29,7 @@ my_model_drag_data_get (GtkTreeDragSource *source,
 {
   GdkContentProvider *content;
   GtkTreeIter iter;
-  gchar *text;
+  char *text;
 
   gtk_tree_model_get_iter (GTK_TREE_MODEL (source), &iter, path);
   gtk_tree_model_get (GTK_TREE_MODEL (source), &iter, 0, &text, -1);
diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c
index e3b17668ef..d47a35b5a6 100644
--- a/tests/testtreeedit.c
+++ b/tests/testtreeedit.c
@@ -20,7 +20,7 @@
 #include <gtk/gtk.h>
 
 typedef struct {
-  const gchar *string;
+  const char *string;
   gboolean is_editable;
   gboolean is_sensitive;
   int progress;
@@ -81,7 +81,7 @@ create_model (void)
 
 static void
 editable_toggled (GtkCellRendererToggle *cell,
-		  gchar                 *path_string,
+		  char                  *path_string,
 		  gpointer               data)
 {
   GtkTreeModel *model = GTK_TREE_MODEL (data);
@@ -100,7 +100,7 @@ editable_toggled (GtkCellRendererToggle *cell,
 
 static void
 sensitive_toggled (GtkCellRendererToggle *cell,
-		   gchar                 *path_string,
+		   char                  *path_string,
 		   gpointer               data)
 {
   GtkTreeModel *model = GTK_TREE_MODEL (data);
@@ -119,8 +119,8 @@ sensitive_toggled (GtkCellRendererToggle *cell,
 
 static void
 edited (GtkCellRendererText *cell,
-	gchar               *path_string,
-	gchar               *new_text,
+	char                *path_string,
+	char                *new_text,
 	gpointer             data)
 {
   GtkTreeModel *model = GTK_TREE_MODEL (data);
@@ -188,7 +188,7 @@ create_control (GtkWidget *box, int number, int cntl, CallbackData *data)
 {
   GtkWidget *checkbutton;
   GCallback  callback = NULL;
-  gchar *name = NULL;
+  char *name = NULL;
 
   switch (cntl)
     {
@@ -228,7 +228,7 @@ quit_cb (GtkWidget *widget,
 }
 
 int
-main (int argc, gchar **argv)
+main (int argc, char **argv)
 {
   GtkWidget *window;
   GtkWidget *scrolled_window;
diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index da5802c3bf..10e98daada 100644
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -22,7 +22,7 @@
 typedef struct _TreeStruct TreeStruct;
 struct _TreeStruct
 {
-  const gchar *label;
+  const char *label;
   gboolean alex;
   gboolean havoc;
   gboolean tim;
@@ -224,7 +224,7 @@ make_model (void)
 
 static void
 alex_toggled (GtkCellRendererToggle *cell,
-	      gchar                 *path_str,
+	      char                  *path_str,
 	      gpointer               data)
 {
   GtkTreeModel *model = (GtkTreeModel *) data;
@@ -243,7 +243,7 @@ alex_toggled (GtkCellRendererToggle *cell,
 
 static void
 havoc_toggled (GtkCellRendererToggle *cell,
-	       gchar                 *path_str,
+	       char                  *path_str,
 	       gpointer               data)
 {
   GtkTreeModel *model = (GtkTreeModel *) data;
@@ -262,7 +262,7 @@ havoc_toggled (GtkCellRendererToggle *cell,
 
 static void
 owen_toggled (GtkCellRendererToggle *cell,
-	      gchar                 *path_str,
+	      char                  *path_str,
 	      gpointer               data)
 {
   GtkTreeModel *model = (GtkTreeModel *) data;
@@ -281,7 +281,7 @@ owen_toggled (GtkCellRendererToggle *cell,
 
 static void
 tim_toggled (GtkCellRendererToggle *cell,
-	     gchar                 *path_str,
+	     char                  *path_str,
 	     gpointer               data)
 {
   GtkTreeModel *model = (GtkTreeModel *) data;
@@ -300,7 +300,7 @@ tim_toggled (GtkCellRendererToggle *cell,
 
 static void
 dave_toggled (GtkCellRendererToggle *cell,
-	      gchar                 *path_str,
+	      char                  *path_str,
 	      gpointer               data)
 {
   GtkTreeModel *model = (GtkTreeModel *) data;
diff --git a/tests/testtreemodel.c b/tests/testtreemodel.c
index dffa4647d6..913bfce662 100644
--- a/tests/testtreemodel.c
+++ b/tests/testtreemodel.c
@@ -47,7 +47,7 @@ list_store_append (GtkTreeModel *model,
 {
   GtkListStore *store = GTK_LIST_STORE (model);
   GtkTreeIter iter;
-  gchar *text;
+  char *text;
 
   text = g_strdup_printf ("row %d", i);
   gtk_list_store_append (store, &iter);
@@ -62,7 +62,7 @@ list_store_prepend (GtkTreeModel *model,
 {
   GtkListStore *store = GTK_LIST_STORE (model);
   GtkTreeIter iter;
-  gchar *text;
+  char *text;
 
   text = g_strdup_printf ("row %d", i);
   gtk_list_store_prepend (store, &iter);
@@ -77,7 +77,7 @@ list_store_insert (GtkTreeModel *model,
 {
   GtkListStore *store = GTK_LIST_STORE (model);
   GtkTreeIter iter;
-  gchar *text;
+  char *text;
   int n;
 
   text = g_strdup_printf ("row %d", i);
@@ -93,7 +93,7 @@ compare (GtkTreeModel *model,
 	 GtkTreeIter  *b,
 	 gpointer      data)
 {
-  gchar *str_a, *str_b;
+  char *str_a, *str_b;
   int result;
 
   gtk_tree_model_get (model, a, 1, &str_a, -1);
@@ -114,7 +114,7 @@ tree_store_append (GtkTreeModel *model,
 {
   GtkTreeStore *store = GTK_TREE_STORE (model);
   GtkTreeIter iter;
-  gchar *text;
+  char *text;
 
   text = g_strdup_printf ("row %d", i);
   gtk_tree_store_append (store, &iter, NULL);
@@ -129,7 +129,7 @@ tree_store_prepend (GtkTreeModel *model,
 {
   GtkTreeStore *store = GTK_TREE_STORE (model);
   GtkTreeIter iter;
-  gchar *text;
+  char *text;
 
   text = g_strdup_printf ("row %d", i);
   gtk_tree_store_prepend (store, &iter, NULL);
@@ -144,7 +144,7 @@ tree_store_insert_flat (GtkTreeModel *model,
 {
   GtkTreeStore *store = GTK_TREE_STORE (model);
   GtkTreeIter iter;
-  gchar *text;
+  char *text;
   int n;
 
   text = g_strdup_printf ("row %d", i);
@@ -188,7 +188,7 @@ tree_store_insert_deep (GtkTreeModel *model,
 {
   GtkTreeStore *store = GTK_TREE_STORE (model);
   GtkTreeIter iter;
-  gchar *text;
+  char *text;
   FindData data;
 
   text = g_strdup_printf ("row %d", i);
diff --git a/tests/testtreepos.c b/tests/testtreepos.c
index 80be31a0be..2980c027b5 100644
--- a/tests/testtreepos.c
+++ b/tests/testtreepos.c
@@ -68,7 +68,7 @@ release_event (GtkGestureClick *gesture,
     {
       GtkTreeModel *model;
       GtkTreeIter iter;
-      gchar *text;
+      char *text;
 
       model = gtk_tree_view_get_model (tv);
       gtk_tree_model_get_iter (model, &iter, path);
diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index 8b923c11dc..a83945b06d 100644
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -23,10 +23,10 @@
 typedef struct _ListSort ListSort;
 struct _ListSort
 {
-  const gchar *word_1;
-  const gchar *word_2;
-  const gchar *word_3;
-  const gchar *word_4;
+  const char *word_1;
+  const char *word_2;
+  const char *word_3;
+  const char *word_4;
   int number_1;
 };
 
diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index 2efb476b22..3aa24d01ca 100644
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -164,7 +164,7 @@ get_model_types (void)
 
 static void
 toggled_callback (GtkCellRendererToggle *celltoggle,
-                  gchar                 *path_string,
+                  char                  *path_string,
                   GtkTreeView           *tree_view)
 {
   GtkTreeModel *model = NULL;
@@ -236,8 +236,8 @@ toggled_callback (GtkCellRendererToggle *celltoggle,
 
 static void
 edited_callback (GtkCellRendererText *renderer,
-		 const gchar   *path_string,
-		 const gchar   *new_text,
+		 const char    *path_string,
+		 const char    *new_text,
 		 GtkTreeView  *tree_view)
 {
   GtkTreeModel *model = NULL;
@@ -545,7 +545,7 @@ typesystem_recurse (GType        type,
   guint n_children = 0;
   int i;
   GtkTreeIter iter;
-  gchar *str;
+  char *str;
   
   gtk_tree_store_append (store, &iter, parent_iter);
 
@@ -958,7 +958,7 @@ gtk_real_model_types_get_value (GtkTreeModel *tree_model,
     {
     case 0:
       {
-        gchar *str;
+        char *str;
         
         g_value_init (value, G_TYPE_STRING);
 
diff --git a/tests/testverticalcells.c b/tests/testverticalcells.c
index 2ef1929977..b5487a26d9 100644
--- a/tests/testverticalcells.c
+++ b/tests/testverticalcells.c
@@ -25,11 +25,11 @@
 typedef struct _TreeEntry TreeEntry;
 
 struct _TreeEntry {
-  const gchar *icon;
-  const gchar *info;
-  const gchar *description;
-  const gchar *fine_print;
-  const gchar *fine_print_color;
+  const char *icon;
+  const char *info;
+  const char *description;
+  const char *fine_print;
+  const char *fine_print_color;
   int progress;
   TreeEntry *entries;
 };
@@ -300,7 +300,7 @@ quit_cb (GtkWidget *widget,
 }
 
 int
-main (int argc, gchar **argv)
+main (int argc, char **argv)
 {
   GtkWidget *window;
   GtkWidget *scrolled_window;
diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c
index 3b7e795a47..8e2a1afd02 100644
--- a/tests/testwindowsize.c
+++ b/tests/testwindowsize.c
@@ -11,7 +11,7 @@ static GtkWidget *resizable_check;
 static void
 size_changed_cb (GdkSurface *surface, int width, int height, GtkLabel *label)
 {
-  gchar *str;
+  char *str;
 
   str = g_strdup_printf ("%d x %d", width, height);
   gtk_label_set_label (label, str);
diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index 34a833538b..e477def08f 100644
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -37,7 +37,7 @@ static void
 node_set (GtkTreeIter *iter)
 {
   int n;
-  gchar *str;
+  char *str;
 
   str = g_strdup_printf ("Row (<span color=\"red\">%d</span>)", node_count++);
   gtk_tree_store_set (base_model, iter, 0, str, -1);
@@ -126,7 +126,7 @@ iter_insert_with_values (GtkWidget *button, GtkTreeView *tree_view)
   GtkTreeIter iter;
   GtkTreeIter selected;
   GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
-  gchar *str1, *str2;
+  char *str1, *str2;
 
   entry = g_object_get_data (G_OBJECT (button), "user_data");
   str1 = g_strdup_printf ("Row (<span color=\"red\">%d</span>)", node_count++);