23 files changed, 153 insertions, 153 deletions

diff --git a/testsuite/gtk/adjustment.c b/testsuite/gtk/adjustment.c
index 598408a58e..dc6c41a742 100644
--- a/testsuite/gtk/adjustment.c
+++ b/testsuite/gtk/adjustment.c
@@ -50,8 +50,8 @@ test_basic (void)
   g_object_unref (a);
 }
 
-static gint changed_count;
-static gint value_changed_count;
+static int changed_count;
+static int value_changed_count;
 
 static void
 changed_cb (GtkAdjustment *a)
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 18b29e2078..b6da2dfbef 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -1880,7 +1880,7 @@ test_add_objects (void)
 {
   GtkBuilder *builder;
   GError *error;
-  gint ret;
+  int ret;
   GObject *obj;
   const gchar *objects[2] = {"mainbox", NULL};
   const gchar *objects2[3] = {"mainbox", "window2", NULL};
diff --git a/testsuite/gtk/entry.c b/testsuite/gtk/entry.c
index 814e3c0809..1f03c4f3d3 100644
--- a/testsuite/gtk/entry.c
+++ b/testsuite/gtk/entry.c
@@ -17,17 +17,17 @@
 
 #include <gtk/gtk.h>
 
-static gint serial = 0;
+static int serial = 0;
 
 typedef struct {
-  gint serial;
-  gint count;
-  gint start;
-  gint end;
+  int serial;
+  int count;
+  int start;
+  int end;
   gchar *text;
   gchar *new_text;
-  gint position;
-  gint length;
+  int position;
+  int length;
 } EntryData;
 
 static void
@@ -49,8 +49,8 @@ notify (GtkEditable *editable, GParamSpec *pspec, EntryData *data)
 static void
 insert_text (GtkEditable *editable,
              const gchar *new_text,
-             gint         new_text_length,
-             gint        *position,
+             int          new_text_length,
+             int         *position,
              EntryData   *data)
 {
   data->serial = serial++;
@@ -71,8 +71,8 @@ insert_text (GtkEditable *editable,
 
 static void
 delete_text (GtkEditable *editable,
-             gint         start_pos,
-             gint         end_pos,
+             int          start_pos,
+             int          end_pos,
              EntryData   *data)
 {
   data->serial = serial++;
@@ -111,7 +111,7 @@ static void
 test_insert (void)
 {
   GtkWidget *entry;
-  gint pos;
+  int pos;
   EntryData data1;
   EntryData data2;
   EntryData data3;
@@ -213,7 +213,7 @@ static void
 test_delete (void)
 {
   GtkWidget *entry;
-  gint pos;
+  int pos;
   EntryData data1;
   EntryData data2;
   EntryData data3;
diff --git a/testsuite/gtk/filtermodel.c b/testsuite/gtk/filtermodel.c
index 5b03a93cf2..9e9916744c 100644
--- a/testsuite/gtk/filtermodel.c
+++ b/testsuite/gtk/filtermodel.c
@@ -4644,7 +4644,7 @@ specific_append_after_collapse_visible_func (GtkTreeModel *model,
                                              GtkTreeIter  *iter,
                                              gpointer      data)
 {
-  gint number;
+  int number;
   gboolean hide_negative_numbers;
 
   gtk_tree_model_get (model, iter, 1, &number, -1);
@@ -4746,7 +4746,7 @@ specific_append_after_collapse (void)
 }
 
 
-static gint
+static int
 specific_sort_filter_remove_node_compare_func (GtkTreeModel  *model,
                                                GtkTreeIter   *iter1,
                                                GtkTreeIter   *iter2,
diff --git a/testsuite/gtk/gestures.c b/testsuite/gtk/gestures.c
index b9ab90b3e8..6e0234e658 100644
--- a/testsuite/gtk/gestures.c
+++ b/testsuite/gtk/gestures.c
@@ -5,8 +5,8 @@
 
 typedef struct {
   GtkWidget *widget;
-  gint x;
-  gint y;
+  int x;
+  int y;
   guint state;
   guint pressed : 1;
 } PointState;
@@ -247,7 +247,7 @@ typedef struct {
 } GestureData;
 
 static void
-press_cb (GtkGesture *g, gint n_press, gdouble x, gdouble y, gpointer data)
+press_cb (GtkGesture *g, int n_press, gdouble x, gdouble y, gpointer data)
 {
   GtkEventController *c = GTK_EVENT_CONTROLLER (g);
   GdkEventSequence *sequence;
diff --git a/testsuite/gtk/grid.c b/testsuite/gtk/grid.c
index cfb2a3d82c..42cfc90f87 100644
--- a/testsuite/gtk/grid.c
+++ b/testsuite/gtk/grid.c
@@ -25,7 +25,7 @@ test_attach (void)
 {
   GtkGrid *g;
   GtkWidget *child, *sibling, *z, *A, *B;
-  gint left, top, width, height;
+  int left, top, width, height;
 
   g = (GtkGrid *)gtk_grid_new ();
 
diff --git a/testsuite/gtk/gtktreemodelrefcount.c b/testsuite/gtk/gtktreemodelrefcount.c
index de84b27994..58d7f05738 100644
--- a/testsuite/gtk/gtktreemodelrefcount.c
+++ b/testsuite/gtk/gtktreemodelrefcount.c
@@ -232,7 +232,7 @@ gtk_tree_model_ref_count_dump (GtkTreeModelRefCount *ref_model)
 static gboolean
 check_iter (GtkTreeModelRefCount *ref_model,
             GtkTreeIter          *iter,
-            gint                  expected_ref_count,
+            int                   expected_ref_count,
             gboolean              may_assert)
 {
   NodeInfo *info;
@@ -267,7 +267,7 @@ check_iter (GtkTreeModelRefCount *ref_model,
 gboolean
 gtk_tree_model_ref_count_check_level (GtkTreeModelRefCount *ref_model,
                                       GtkTreeIter          *parent,
-                                      gint                  expected_ref_count,
+                                      int                   expected_ref_count,
                                       gboolean              recurse,
                                       gboolean              may_assert)
 {
@@ -299,7 +299,7 @@ gtk_tree_model_ref_count_check_level (GtkTreeModelRefCount *ref_model,
 gboolean
 gtk_tree_model_ref_count_check_node (GtkTreeModelRefCount *ref_model,
                                      GtkTreeIter          *iter,
-                                     gint                  expected_ref_count,
+                                     int                   expected_ref_count,
                                      gboolean              may_assert)
 {
   return check_iter (ref_model, iter, expected_ref_count, may_assert);
diff --git a/testsuite/gtk/gtktreemodelrefcount.h b/testsuite/gtk/gtktreemodelrefcount.h
index a4b4011a24..019f166478 100644
--- a/testsuite/gtk/gtktreemodelrefcount.h
+++ b/testsuite/gtk/gtktreemodelrefcount.h
@@ -54,12 +54,12 @@ GtkTreeModel *gtk_tree_model_ref_count_new         (void);
 void          gtk_tree_model_ref_count_dump        (GtkTreeModelRefCount *ref_model);
 gboolean      gtk_tree_model_ref_count_check_level (GtkTreeModelRefCount *ref_model,
                                                     GtkTreeIter          *parent,
-                                                    gint                  expected_ref_count,
+                                                    int                   expected_ref_count,
                                                     gboolean              recurse,
                                                     gboolean              may_assert);
 gboolean      gtk_tree_model_ref_count_check_node  (GtkTreeModelRefCount *ref_model,
                                                     GtkTreeIter          *iter,
-                                                    gint                  expected_ref_count,
+                                                    int                   expected_ref_count,
                                                     gboolean              may_assert);
 
 /* A couple of helpers for the tests.  Since this model will never be used
@@ -88,14 +88,14 @@ assert_level_unreferenced (GtkTreeModelRefCount *ref_model,
 
 static inline void
 assert_entire_model_referenced (GtkTreeModelRefCount *ref_model,
-                                gint                  ref_count)
+                                int                   ref_count)
 {
   gtk_tree_model_ref_count_check_level (ref_model, NULL, ref_count, TRUE, TRUE);
 }
 
 static inline void
 assert_not_entire_model_referenced (GtkTreeModelRefCount *ref_model,
-                                    gint                  ref_count)
+                                    int                   ref_count)
 {
   g_assert_cmpint (gtk_tree_model_ref_count_check_level (ref_model, NULL,
                                                          ref_count,
@@ -105,7 +105,7 @@ assert_not_entire_model_referenced (GtkTreeModelRefCount *ref_model,
 
 static inline void
 assert_root_level_referenced (GtkTreeModelRefCount *ref_model,
-                              gint                  ref_count)
+                              int                   ref_count)
 {
   gtk_tree_model_ref_count_check_level (ref_model, NULL, ref_count,
                                         FALSE, TRUE);
@@ -113,7 +113,7 @@ assert_root_level_referenced (GtkTreeModelRefCount *ref_model,
 
 static inline void
 assert_level_referenced (GtkTreeModelRefCount *ref_model,
-                         gint                  ref_count,
+                         int                   ref_count,
                          GtkTreeIter          *iter)
 {
   gtk_tree_model_ref_count_check_level (ref_model, iter, ref_count,
@@ -123,7 +123,7 @@ assert_level_referenced (GtkTreeModelRefCount *ref_model,
 static inline void
 assert_node_ref_count (GtkTreeModelRefCount *ref_model,
                        GtkTreeIter          *iter,
-                       gint                  ref_count)
+                       int                   ref_count)
 {
   gtk_tree_model_ref_count_check_node (ref_model, iter, ref_count, TRUE);
 }
diff --git a/testsuite/gtk/icontheme.c b/testsuite/gtk/icontheme.c
index a343c75735..b6387ce9d9 100644
--- a/testsuite/gtk/icontheme.c
+++ b/testsuite/gtk/icontheme.c
@@ -50,12 +50,12 @@ lookup_flags_to_string (GtkIconLookupFlags flags)
 
 static void
 assert_icon_lookup_size (const char         *icon_name,
-                         gint                size,
+                         int                 size,
                          GtkTextDirection    direction,
                          GtkIconLookupFlags  flags,
                          gboolean            fallbacks,
                          const char         *filename,
-                         gint                pixbuf_size)
+                         int                 pixbuf_size)
 {
   GtkIconPaintable *info;
   GFile *file;
@@ -111,7 +111,7 @@ assert_icon_lookup_size (const char         *icon_name,
 
 static void
 assert_icon_lookup (const char         *icon_name,
-                    gint                size,
+                    int                 size,
                     GtkTextDirection    direction,
                     GtkIconLookupFlags  flags,
                     gboolean            fallbacks,
@@ -122,7 +122,7 @@ assert_icon_lookup (const char         *icon_name,
 
 static void
 assert_icon_lookup_fails (const char         *icon_name,
-                          gint                size,
+                          int                 size,
                           GtkTextDirection    direction,
                           GtkIconLookupFlags  flags)
 {
@@ -170,7 +170,7 @@ log_writer (GLogLevelFlags   log_level,
 
 static void
 assert_lookup_order (const char         *icon_name,
-                     gint                size,
+                     int                 size,
                      GtkTextDirection    direction,
                      GtkIconLookupFlags  flags,
                      gboolean            fallbacks,
@@ -734,7 +734,7 @@ test_inherit (void)
 static void
 test_nonsquare_symbolic (void)
 {
-  gint width, height, size;
+  int width, height, size;
   GtkIconTheme *icon_theme;
   GtkIconPaintable *info;
   GFile *file;
diff --git a/testsuite/gtk/listbox.c b/testsuite/gtk/listbox.c
index 88b24108eb..43c2443651 100644
--- a/testsuite/gtk/listbox.c
+++ b/testsuite/gtk/listbox.c
@@ -1,13 +1,13 @@
 #include <gtk/gtk.h>
 
-static gint
+static int
 sort_list (GtkListBoxRow *row1,
            GtkListBoxRow *row2,
            gpointer       data)
 {
   GtkWidget *label1, *label2;
-  gint n1, n2;
-  gint *count = data;
+  int n1, n2;
+  int *count = data;
 
   (*count)++;
 
@@ -51,9 +51,9 @@ test_sort (void)
   GtkListBox *list;
   GtkListBoxRow *row;
   GtkWidget *label;
-  gint i, r;
+  int i, r;
   gchar *s;
-  gint count;
+  int count;
 
   list = GTK_LIST_BOX (gtk_list_box_new ());
   g_object_ref_sink (list);
@@ -94,7 +94,7 @@ on_row_selected (GtkListBox    *list_box,
                  GtkListBoxRow *row,
                  gpointer       data)
 {
-  gint *i = data;
+  int *i = data;
 
   (*i)++;
 
@@ -107,10 +107,10 @@ test_selection (void)
   GtkListBox *list;
   GtkListBoxRow *row, *row2;
   GtkWidget *label;
-  gint i;
+  int i;
   gchar *s;
-  gint count;
-  gint index;
+  int count;
+  int index;
 
   list = GTK_LIST_BOX (gtk_list_box_new ());
   g_object_ref_sink (list);
@@ -184,7 +184,7 @@ test_selection (void)
 static void
 on_selected_rows_changed (GtkListBox *box, gpointer data)
 {
-  gint *i = data;
+  int *i = data;
 
   (*i)++;
 }
@@ -196,9 +196,9 @@ test_multi_selection (void)
   GList *l;
   GtkListBoxRow *row, *row2;
   GtkWidget *label;
-  gint i;
+  int i;
   gchar *s;
-  gint count;
+  int count;
 
   list = GTK_LIST_BOX (gtk_list_box_new ());
   g_object_ref_sink (list);
@@ -272,9 +272,9 @@ static gboolean
 filter_func (GtkListBoxRow *row,
              gpointer       data)
 {
-  gint *count = data;
+  int *count = data;
   GtkWidget *child;
-  gint i;
+  int i;
 
   (*count)++;
 
@@ -287,7 +287,7 @@ filter_func (GtkListBoxRow *row,
 static void
 check_filtered (GtkListBox *list)
 {
-  gint count;
+  int count;
   GtkWidget *row;
 
   count = 0;
@@ -309,10 +309,10 @@ test_filter (void)
 {
   GtkListBox *list;
   GtkListBoxRow *row;
-  gint i;
+  int i;
   gchar *s;
   GtkWidget *label;
-  gint count;
+  int count;
 
   list = GTK_LIST_BOX (gtk_list_box_new ());
   g_object_ref_sink (list);
@@ -354,8 +354,8 @@ header_func (GtkListBoxRow *row,
              gpointer       data)
 {
   GtkWidget *child;
-  gint i;
-  gint *count = data;
+  int i;
+  int *count = data;
   GtkWidget *header;
   gchar *s;
 
@@ -379,7 +379,7 @@ header_func (GtkListBoxRow *row,
 static void
 check_headers (GtkListBox *list)
 {
-  gint count;
+  int count;
   GtkWidget *row;
 
   count = 0;
@@ -401,10 +401,10 @@ test_header (void)
 {
   GtkListBox *list;
   GtkListBoxRow *row;
-  gint i;
+  int i;
   gchar *s;
   GtkWidget *label;
-  gint count;
+  int count;
 
   list = GTK_LIST_BOX (gtk_list_box_new ());
   g_object_ref_sink (list);
diff --git a/testsuite/gtk/liststore.c b/testsuite/gtk/liststore.c
index 4455a13dff..0bf77f6890 100644
--- a/testsuite/gtk/liststore.c
+++ b/testsuite/gtk/liststore.c
@@ -99,8 +99,8 @@ list_store_teardown (ListStore     *fixture,
 
 static void
 check_model (ListStore *fixture,
-	     gint      *new_order,
-	     gint       skip)
+	     int       *new_order,
+	     int        skip)
 {
   int i;
   GtkTreePath *path;
diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index ddd806948d..ed2076455f 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -41,7 +41,7 @@ assert_notifies (GObject    *object,
 typedef struct
 {
   const gchar *name;
-  gint count;
+  int count;
 } NotifyData;
 
 static void
@@ -64,12 +64,12 @@ check_property (GObject *instance, GParamSpec *pspec)
   if (G_TYPE_IS_ENUM (pspec->value_type))
     {
       GEnumClass *class;
-      gint i;
+      int i;
       NotifyData data;
       gulong id;
-      gint first;
-      gint value;
-      gint current_count;
+      int first;
+      int value;
+      int current_count;
 
       class = g_type_class_ref (pspec->value_type);
 
@@ -103,11 +103,11 @@ check_property (GObject *instance, GParamSpec *pspec)
   else if (G_TYPE_IS_FLAGS (pspec->value_type))
     {
       GFlagsClass *class;
-      gint i;
+      int i;
       NotifyData data;
       gulong id;
       guint value;
-      gint current_count;
+      int current_count;
 
       class = g_type_class_ref (pspec->value_type);
 
@@ -165,11 +165,11 @@ check_property (GObject *instance, GParamSpec *pspec)
   else if (pspec->value_type == G_TYPE_INT)
     {
       GParamSpecInt *p = G_PARAM_SPEC_INT (pspec);
-      gint i;
+      int i;
       NotifyData data;
       gulong id;
-      gint value;
-      gint current_count;
+      int value;
+      int current_count;
 
       data.name = pspec->name;
       data.count = 0;
@@ -202,7 +202,7 @@ check_property (GObject *instance, GParamSpec *pspec)
       NotifyData data;
       gulong id;
       guint value;
-      gint current_count;
+      int current_count;
       guint minimum, maximum;
 
       if (G_IS_PARAM_SPEC_UINT (pspec))
@@ -274,7 +274,7 @@ check_property (GObject *instance, GParamSpec *pspec)
       gulong id;
       gdouble value;
       gdouble new_value;
-      gint current_count;
+      int current_count;
       gdouble delta;
 
       data.name = pspec->name;
@@ -315,7 +315,7 @@ check_property (GObject *instance, GParamSpec *pspec)
       gulong id;
       gfloat value;
       gfloat new_value;
-      gint current_count;
+      int current_count;
 
       data.name = pspec->name;
       data.count = 0;
@@ -678,7 +678,7 @@ main (int argc, char **argv)
 {
   const GType *otypes;
   guint i;
-  gint result;
+  int result;
 
   gtk_test_init (&argc, &argv);
   gtk_test_register_all_types();
diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
index e46f404424..17bebfd9c8 100644
--- a/testsuite/gtk/objects-finalize.c
+++ b/testsuite/gtk/objects-finalize.c
@@ -129,7 +129,7 @@ main (int argc, char **argv)
 {
   const GType *all_types;
   guint n_types = 0, i;
-  gint result;
+  int result;
   const char *display, *x_r_d;
 
   /* These must be set before gtk_test_init */
diff --git a/testsuite/gtk/rbtree.c b/testsuite/gtk/rbtree.c
index 0975c47d51..b40ae6eb4c 100644
--- a/testsuite/gtk/rbtree.c
+++ b/testsuite/gtk/rbtree.c
@@ -61,11 +61,11 @@ count_total (GtkTreeRBTree *tree,
   return res;
 }
 
-static gint
+static int
 _count_nodes (GtkTreeRBTree *tree,
               GtkTreeRBNode *node)
 {
-  gint res;
+  int res;
   if (gtk_tree_rbtree_is_nil (node))
     return 0;
 
@@ -84,7 +84,7 @@ static void
 gtk_tree_rbtree_test_height (GtkTreeRBTree *tree,
                              GtkTreeRBNode *node)
 {
-  gint computed_offset = 0;
+  int computed_offset = 0;
 
   /* This whole test is sort of a useless truism. */
 
@@ -113,7 +113,7 @@ gtk_tree_rbtree_test_height (GtkTreeRBTree *tree,
 static void
 gtk_tree_rbtree_test_dirty (GtkTreeRBTree *tree,
                             GtkTreeRBNode *node,
-                            gint           expected_dirtyness)
+                            int            expected_dirtyness)
 {
   g_assert (node);
 
@@ -230,9 +230,9 @@ gtk_tree_rbtree_test (GtkTreeRBTree *tree)
 static void
 gtk_rbtree_print_node (GtkTreeRBTree *tree,
                        GtkTreeRBNode *node,
-                       gint           depth)
+                       int            depth)
 {
-  gint i;
+  int i;
   for (i = 0; i < depth; i++)
     g_print ("\t");
 
@@ -429,13 +429,13 @@ test_remove_root (void)
   gtk_tree_rbtree_free (tree);
 }
 
-static gint *
+static int *
 fisher_yates_shuffle (guint n_items)
 {
-  gint *list;
+  int *list;
   guint i, j;
 
-  list = g_new (gint, n_items);
+  list = g_new (int, n_items);
 
   for (i = 0; i < n_items; i++)
     {
@@ -448,7 +448,7 @@ fisher_yates_shuffle (guint n_items)
 }
 
 static GtkTreeRBTree *
-create_unsorted_tree (gint *order,
+create_unsorted_tree (int *order,
                       guint n)
 {
   GtkTreeRBTree *tree;
@@ -480,7 +480,7 @@ test_reorder (void)
   guint n = g_test_perf () ? 1000000 : 100;
   GtkTreeRBTree *tree;
   GtkTreeRBNode *node;
-  gint *reorder;
+  int *reorder;
   guint i;
   double elapsed;
 
diff --git a/testsuite/gtk/recentmanager.c b/testsuite/gtk/recentmanager.c
index 8173b3f00b..9594c9fe1a 100644
--- a/testsuite/gtk/recentmanager.c
+++ b/testsuite/gtk/recentmanager.c
@@ -101,7 +101,7 @@ recent_manager_add (void)
 typedef struct {
   GtkRecentManager *manager;
   GMainLoop *main_loop;
-  gint counter;
+  int counter;
 } AddManyClosure;
 
 static void
@@ -284,7 +284,7 @@ recent_manager_purge (void)
 {
   GtkRecentManager *manager;
   GtkRecentData *recent_data;
-  gint n;
+  int n;
   GError *error;
 
   manager = gtk_recent_manager_get_default ();
diff --git a/testsuite/gtk/spinbutton.c b/testsuite/gtk/spinbutton.c
index ace411e944..e8e35d9227 100644
--- a/testsuite/gtk/spinbutton.c
+++ b/testsuite/gtk/spinbutton.c
@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 
-static gint value_changed_count;
+static int value_changed_count;
 
 static void
 value_changed_cb (GtkSpinButton *spin)
@@ -37,7 +37,7 @@ test_value_changed (void)
   g_assert_cmpint (value_changed_count, ==, 5);
 }
 
-static gint adjustment_changed_count;
+static int adjustment_changed_count;
 
 static void
 adjustment_changed_cb (GObject *object, GParamSpec *pspec)
diff --git a/testsuite/gtk/textbuffer.c b/testsuite/gtk/textbuffer.c
index 1f2b95ff37..7498f2b789 100644
--- a/testsuite/gtk/textbuffer.c
+++ b/testsuite/gtk/textbuffer.c
@@ -90,13 +90,13 @@ check_get_set_text (GtkTextBuffer *buffer,
     g_error ("%d chars, expected 0", n);
 }
 
-static gint
+static int
 count_toggles_at_iter (GtkTextIter *iter,
                        GtkTextTag  *of_tag)
 {
   GSList *tags;
   GSList *tmp;
-  gint count = 0;
+  int count = 0;
   
   /* get toggle-ons and toggle-offs */
   tags = gtk_text_iter_get_toggled_tags (iter, TRUE);
@@ -119,14 +119,14 @@ count_toggles_at_iter (GtkTextIter *iter,
   return count;
 }
 
-static gint
+static int
 count_toggles_in_range_by_char (GtkTextBuffer     *buffer,
                                 GtkTextTag        *of_tag,
                                 const GtkTextIter *start,
                                 const GtkTextIter *end)
 {
   GtkTextIter iter;
-  gint count = 0;
+  int count = 0;
   
   iter = *start;
   do
@@ -144,7 +144,7 @@ count_toggles_in_range_by_char (GtkTextBuffer     *buffer,
   return count;
 }
 
-static gint
+static int
 count_toggles_in_buffer (GtkTextBuffer *buffer,
                          GtkTextTag    *of_tag)
 {
@@ -164,9 +164,9 @@ check_specific_tag_in_range (GtkTextBuffer     *buffer,
   GtkTextIter iter;
   GtkTextTag *tag;
   gboolean state;
-  gint count;
-  gint buffer_count;
-  gint last_offset;
+  int count;
+  int buffer_count;
+  int last_offset;
 
   if (gtk_text_iter_compare (start, end) > 0)
     {
@@ -189,7 +189,7 @@ check_specific_tag_in_range (GtkTextBuffer     *buffer,
     {
       do
         {
-          gint this_offset;
+          int this_offset;
           
           ++count;
 
@@ -233,7 +233,7 @@ check_specific_tag_in_range (GtkTextBuffer     *buffer,
     {
       do
         {
-          gint this_offset;
+          int this_offset;
           
           ++count;
 
@@ -289,13 +289,13 @@ run_tests (GtkTextBuffer *buffer)
   GtkTextIter start;
   GtkTextIter end;
   GtkTextIter mark;
-  gint i, j;
-  gint num_chars;
+  int i, j;
+  int num_chars;
   GtkTextMark *bar_mark;
   GtkTextTag *tag;
   GHashTable *tag_states;
-  gint count;
-  gint buffer_count;
+  int count;
+  int buffer_count;
   
   gtk_text_buffer_get_bounds (buffer, &start, &end);
 
@@ -809,7 +809,7 @@ test_line_separation (const char* str,
   GtkTextBuffer* buffer;
   gboolean on_next_line;
   gboolean on_end_iter;
-  gint new_pos;
+  int new_pos;
 
   buffer = gtk_text_buffer_new (NULL);
 
@@ -1464,7 +1464,7 @@ test_get_iter (void)
 {
   GtkTextBuffer *buffer;
   GtkTextIter iter;
-  gint offset;
+  int offset;
 
   buffer = gtk_text_buffer_new (NULL);
 
diff --git a/testsuite/gtk/textiter.c b/testsuite/gtk/textiter.c
index 6f6e14f803..c13e277ca3 100644
--- a/testsuite/gtk/textiter.c
+++ b/testsuite/gtk/textiter.c
@@ -286,7 +286,7 @@ test_forward_to_tag_toggle (void)
   GtkTextTag *bold_tag;
   GtkTextTag *editable_tag;
   GtkTextIter iter;
-  gint offset;
+  int offset;
 
   buffer = gtk_text_buffer_new (NULL);
 
@@ -332,8 +332,8 @@ test_forward_to_tag_toggle (void)
 
 static void
 check_forward_line_end (const gchar *buffer_text,
-                        gint         initial_offset,
-                        gint         result_offset,
+                        int          initial_offset,
+                        int          result_offset,
                         gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -364,7 +364,7 @@ test_forward_to_line_end (void)
 
 static void
 check_word_boundaries (const gchar *buffer_text,
-                       gint         offset,
+                       int          offset,
                        gboolean     starts_word,
                        gboolean     ends_word,
                        gboolean     inside_word)
@@ -386,8 +386,8 @@ check_word_boundaries (const gchar *buffer_text,
 
 static void
 check_forward_word_end (const gchar *buffer_text,
-                        gint         initial_offset,
-                        gint         result_offset,
+                        int          initial_offset,
+                        int          result_offset,
                         gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -406,8 +406,8 @@ check_forward_word_end (const gchar *buffer_text,
 
 static void
 check_backward_word_start (const gchar *buffer_text,
-                           gint         initial_offset,
-                           gint         result_offset,
+                           int          initial_offset,
+                           int          result_offset,
                            gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -453,8 +453,8 @@ test_word_boundaries (void)
 
 static void
 check_forward_visible_word_end (GtkTextBuffer *buffer,
-                                gint           initial_offset,
-                                gint           result_offset,
+                                int            initial_offset,
+                                int            result_offset,
                                 gboolean       ret)
 {
   GtkTextIter iter;
@@ -467,8 +467,8 @@ check_forward_visible_word_end (GtkTextBuffer *buffer,
 
 static void
 check_backward_visible_word_start (GtkTextBuffer *buffer,
-                                   gint           initial_offset,
-                                   gint           result_offset,
+                                   int            initial_offset,
+                                   int            result_offset,
                                    gboolean       ret)
 {
   GtkTextIter iter;
@@ -536,7 +536,7 @@ test_visible_word_boundaries (void)
 
 static void
 check_is_cursor_position (const gchar *buffer_text,
-                          gint         offset,
+                          int          offset,
                           gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -554,8 +554,8 @@ check_is_cursor_position (const gchar *buffer_text,
 static void
 check_cursor_position (const gchar *buffer_text,
                        gboolean     forward,
-                       gint         initial_offset,
-                       gint         result_offset,
+                       int          initial_offset,
+                       int          result_offset,
                        gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -604,8 +604,8 @@ test_cursor_positions (void)
 static void
 check_visible_cursor_position (GtkTextBuffer *buffer,
                                gboolean       forward,
-                               gint           initial_offset,
-                               gint           result_offset,
+                               int            initial_offset,
+                               int            result_offset,
                                gboolean       ret)
 {
   GtkTextIter iter;
@@ -658,7 +658,7 @@ test_visible_cursor_positions (void)
 
 static void
 check_sentence_boundaries (const gchar *buffer_text,
-                           gint         offset,
+                           int          offset,
                            gboolean     starts_sentence,
                            gboolean     ends_sentence,
                            gboolean     inside_sentence)
@@ -680,8 +680,8 @@ check_sentence_boundaries (const gchar *buffer_text,
 
 static void
 check_forward_sentence_end (const gchar *buffer_text,
-                            gint         initial_offset,
-                            gint         result_offset,
+                            int          initial_offset,
+                            int          result_offset,
                             gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -700,8 +700,8 @@ check_forward_sentence_end (const gchar *buffer_text,
 
 static void
 check_backward_sentence_start (const gchar *buffer_text,
-                               gint         initial_offset,
-                               gint         result_offset,
+                               int          initial_offset,
+                               int          result_offset,
                                gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -749,7 +749,7 @@ test_backward_line (void)
   GtkTextBuffer *buffer;
   GtkTextIter iter, start, end;
   gboolean ret;
-  gint offset;
+  int offset;
 
   buffer = gtk_text_buffer_new (NULL);
   gtk_text_buffer_get_start_iter (buffer, &iter);
diff --git a/testsuite/gtk/treemodel.c b/testsuite/gtk/treemodel.c
index 54db6e94eb..a9ebd0d06d 100644
--- a/testsuite/gtk/treemodel.c
+++ b/testsuite/gtk/treemodel.c
@@ -240,7 +240,7 @@ static void
 signal_monitor_rows_reordered (GtkTreeModel *model,
                                GtkTreePath  *path,
                                GtkTreeIter  *iter,
-                               gint         *new_order,
+                               int          *new_order,
                                gpointer      data)
 {
   signal_monitor_generic_handler (data, ROWS_REORDERED,
diff --git a/testsuite/gtk/treepath.c b/testsuite/gtk/treepath.c
index c014de2c5f..da77bf0a43 100644
--- a/testsuite/gtk/treepath.c
+++ b/testsuite/gtk/treepath.c
@@ -23,8 +23,8 @@ static void
 test_append (void)
 {
   GtkTreePath *p;
-  gint i;
-  gint *indices;
+  int i;
+  int *indices;
 
   p = gtk_tree_path_new ();
   for (i = 0; i < 100; i++)
@@ -44,8 +44,8 @@ static void
 test_prepend (void)
 {
   GtkTreePath *p;
-  gint i;
-  gint *indices;
+  int i;
+  int *indices;
 
   p = gtk_tree_path_new ();
   for (i = 0; i < 100; i++)
@@ -66,9 +66,9 @@ test_to_string (void)
 {
   const gchar *str = "0:1:2:3:4:5:6:7:8:9:10";
   GtkTreePath *p;
-  gint *indices;
+  int *indices;
   gchar *s;
-  gint i;
+  int i;
 
   p = gtk_tree_path_new_from_string (str);
   indices = gtk_tree_path_get_indices (p);
@@ -85,8 +85,8 @@ static void
 test_from_indices (void)
 {
   GtkTreePath *p;
-  gint *indices;
-  gint i;
+  int *indices;
+  int i;
 
   p = gtk_tree_path_new_from_indices (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1);
   g_assert_cmpint (gtk_tree_path_get_depth (p), ==, 10);
@@ -111,9 +111,9 @@ test_navigation (void)
 {
   GtkTreePath *p;
   GtkTreePath *q;
-  gint *pi;
-  gint *qi;
-  gint i;
+  int *pi;
+  int *qi;
+  int i;
   gboolean res;
 
   p = gtk_tree_path_new_from_indices (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1);
diff --git a/testsuite/gtk/treestore.c b/testsuite/gtk/treestore.c
index a58ab780f9..af1d651695 100644
--- a/testsuite/gtk/treestore.c
+++ b/testsuite/gtk/treestore.c
@@ -102,8 +102,8 @@ tree_store_teardown (TreeStore     *fixture,
 
 static void
 check_model (TreeStore *fixture,
-	     gint      *new_order,
-	     gint       skip)
+	     int       *new_order,
+	     int        skip)
 {
   int i;
   GtkTreePath *path;
@@ -1062,7 +1062,7 @@ static void
 specific_bug_698396 (void)
 {
   GtkTreeStore *tree_store;
-  gint new_order[1] = { 0 };
+  int new_order[1] = { 0 };
 
   /*http://bugzilla.gnome.org/show_bug.cgi?id=698396 */
 
diff --git a/testsuite/gtk/typename.c b/testsuite/gtk/typename.c
index f468ac6542..ddbdf44746 100644
--- a/testsuite/gtk/typename.c
+++ b/testsuite/gtk/typename.c
@@ -24,7 +24,7 @@ type_name_mangle (const gchar *name,
                   gboolean     split_first_cap)
 {
   GString *symbol_name = g_string_new ("");
-  gint i;
+  int i;
 
   for (i = 0; name[i] != '\0'; i++)
     {
diff --git a/testsuite/gtk/window.c b/testsuite/gtk/window.c
index c67dfb745b..8ffc0645bf 100644
--- a/testsuite/gtk/window.c
+++ b/testsuite/gtk/window.c
@@ -26,7 +26,7 @@ on_draw (GtkDrawingArea *da,
          int             height,
          gpointer        data)
 {
-  gint i, j;
+  int i, j;
 
   for (i = 0; 20 * i < width; i++)
     {
@@ -64,7 +64,7 @@ test_default_size (void)
 {
   GtkWidget *window;
   GtkWidget *da;
-  gint w, h;
+  int w, h;
   gboolean done;
 
   window = gtk_window_new ();
@@ -152,7 +152,7 @@ test_resize (void)
 {
   GtkWidget *window;
   GtkWidget *da;
-  gint w, h;
+  int w, h;
   gboolean done;
 
   window = gtk_window_new ();
@@ -214,7 +214,7 @@ static void
 test_resize_popup (void)
 {
   GtkWidget *window;
-  gint w, h;
+  int w, h;
   gboolean done;
 
   /* testcase for the dnd window */
@@ -244,7 +244,7 @@ static void
 test_show_hide (void)
 {
   GtkWidget *window;
-  gint w, h, w1, h1;
+  int w, h, w1, h1;
   gboolean done;
 
   /*http://bugzilla.gnome.org/show_bug.cgi?id=696882 */
@@ -293,7 +293,7 @@ test_show_hide (void)
 int
 main (int argc, char *argv[])
 {
-  gint i;
+  int i;
 
   gtk_test_init (&argc, &argv);