made the <widget>_signals[] arrays of type guint rather than gint. made

Mon Mar  9 15:48:10 1998  Tim Janik  <timj@gimp.org>

        * Signal signedness and naming corrections, plus GtkType fixes:

        * gtk/gtkadjustment.c:
        * gtk/gtkbutton.c:
        * gtk/gtkcheckmenuitem.c:
        * gtk/gtkclist.c:
        * gtk/gtkcolorsel.c:
        * gtk/gtkcontainer.c:
        * gtk/gtkcurve.c:
        * gtk/gtkdata.c:
        * gtk/gtkeditable.c:
        * gtk/gtkentry.c:
        * gtk/gtkhandlebox.c:
        * gtk/gtkinputdialog.c:
        * gtk/gtkitem.c:
        * gtk/gtklist.c:
        * gtk/gtkmenuitem.c:
        * gtk/gtkmenushell.c:
        * gtk/gtknotebook.c:
        * gtk/gtkstatusbar.c:
        * gtk/gtktoolbar.c:
        * gtk/gtktree.c:
        * gtk/gtktreeitem.c:
        * gtk/gtkwidget.c:
        * gtk/gtktogglebutton.c:
        * gtk/gtkwindow.c:
        made the <widget>_signals[] arrays of type guint rather than gint.
        * gtk/gtkwidget.c (gtk_widget_get_ancestor): made widget_type a GtkType.

        * gtk/gtkcombo.h:
        handler ids need to be of type guint (entry_change_id, list_change_id).

        * gtk/gtkaccelerator.c:
        changed signal_num to signal_id and typed it guint.

        * gtk/gtkmain.c: made gtk_ndebug_keys a guint.

        * gtk/gtkmenu.h:
        * gtk/gtkmenu.c:
        (gtk_menu_popup): made button a guint.
        (gtk_menu_set_active): made index a guint.

        * gtk/gtkmenuitem.h:
        * gtk/gtkmenuitem.c:
        made accelerator_signal a guint.

        * gtk/gtkoptionmenu.h:
        * gtk/gtkoptionmenu.c:
        (gtk_option_menu_set_history): made index a guint.

        * gtk/gtksignal.h:
        * gtk/gtksignal.c:
        * gtk/gtkobject.h:
        * gtk/gtkobject.c: changed a bunch of prototypes to take guints rather
        than gints. also made some conversions from guint to GtkType, left over
        from when the fundamental-types system was introduced.

        * gtk/gtkobject.h:
        * gtk/gtkobject.c: made object_data_id_index and obj_count guints.
        made *signals and nsignals guints in GtkObjectClass.

39 files changed, 453 insertions, 453 deletions

diff --git a/gtk/gtkaccelerator.c b/gtk/gtkaccelerator.c
index cd8b3a7247..e6e0b864bb 100644
--- a/gtk/gtkaccelerator.c
+++ b/gtk/gtkaccelerator.c
@@ -27,7 +27,7 @@ struct _GtkAcceleratorEntry
 {
   guint8 modifiers;
   GtkObject *object;
-  gint signal_num;
+  guint signal_id;
 };
 
 
@@ -37,7 +37,7 @@ static void gtk_accelerator_table_clean (GtkAcceleratorTable *table);
 
 static GtkAcceleratorTable *default_table = NULL;
 static GSList *tables = NULL;
-static guint8 gtk_accelerator_table_default_mod_mask = ~0;
+static guint8 gtk_accelerator_table_default_mod_mask = (guint8) ~0;
 
 
 GtkAcceleratorTable*
@@ -63,13 +63,13 @@ gtk_accelerator_table_find (GtkObject   *object,
   GtkAcceleratorEntry *entry;
   GSList *tmp_list;
   GList *entries;
-  gint signal_num;
+  guint signal_id;
   guint hash;
 
   g_return_val_if_fail (object != NULL, NULL);
   g_return_val_if_fail (signal_name != NULL, NULL);
 
-  signal_num = gtk_signal_lookup (signal_name, GTK_OBJECT_TYPE (object));
+  signal_id = gtk_signal_lookup (signal_name, GTK_OBJECT_TYPE (object));
   hash = (guint) accelerator_key;
 
   tmp_list = tables;
@@ -85,7 +85,7 @@ gtk_accelerator_table_find (GtkObject   *object,
 	  entries = entries->next;
 
 	  if ((entry->object == object) &&
-	      (entry->signal_num == signal_num) &&
+	      (entry->signal_id == signal_id) &&
 	      ((entry->modifiers & table->modifier_mask) ==
 	       (accelerator_mods & table->modifier_mask)))
 	    return table;
@@ -128,7 +128,7 @@ gtk_accelerator_table_install (GtkAcceleratorTable *table,
   GtkAcceleratorEntry *entry;
   GList *entries;
   gchar *signame;
-  gint signal_num;
+  guint signal_id;
   guint hash;
 
   g_return_if_fail (object != NULL);
@@ -140,8 +140,8 @@ gtk_accelerator_table_install (GtkAcceleratorTable *table,
       table = default_table;
     }
 
-  signal_num = gtk_signal_lookup (signal_name, GTK_OBJECT_TYPE (object));
-  g_return_if_fail (signal_num != 0);
+  signal_id = gtk_signal_lookup (signal_name, GTK_OBJECT_TYPE (object));
+  g_return_if_fail (signal_id != 0);
 
   hash = (guint) accelerator_key;
   entries = table->entries[hash];
@@ -155,7 +155,7 @@ gtk_accelerator_table_install (GtkAcceleratorTable *table,
 	{
 	  if (GTK_IS_WIDGET (entry->object))
 	    {
-	      signame = gtk_signal_name (entry->signal_num);
+	      signame = gtk_signal_name (entry->signal_id);
 	      gtk_signal_emit_by_name (entry->object,
 				       "remove_accelerator",
 				       signame);
@@ -163,7 +163,7 @@ gtk_accelerator_table_install (GtkAcceleratorTable *table,
 
 	  entry->modifiers = accelerator_mods;
 	  entry->object = object;
-	  entry->signal_num = signal_num;
+	  entry->signal_id = signal_id;
 	  return;
 	}
 
@@ -173,7 +173,7 @@ gtk_accelerator_table_install (GtkAcceleratorTable *table,
   entry = g_new (GtkAcceleratorEntry, 1);
   entry->modifiers = accelerator_mods;
   entry->object = object;
-  entry->signal_num = signal_num;
+  entry->signal_id = signal_id;
 
   table->entries[hash] = g_list_prepend (table->entries[hash], entry);
 }
@@ -186,7 +186,7 @@ gtk_accelerator_table_remove (GtkAcceleratorTable *table,
   GtkAcceleratorEntry *entry;
   GList *entries;
   GList *temp_list;
-  gint signal_num;
+  guint signal_id;
   gint i;
 
   g_return_if_fail (object != NULL);
@@ -198,8 +198,8 @@ gtk_accelerator_table_remove (GtkAcceleratorTable *table,
       table = default_table;
     }
 
-  signal_num = gtk_signal_lookup (signal_name, GTK_OBJECT_TYPE (object));
-  g_return_if_fail (signal_num != 0);
+  signal_id = gtk_signal_lookup (signal_name, GTK_OBJECT_TYPE (object));
+  g_return_if_fail (signal_id != 0);
 
   for (i = 0; i < 256; i++)
     {
@@ -209,7 +209,7 @@ gtk_accelerator_table_remove (GtkAcceleratorTable *table,
 	{
 	  entry = entries->data;
 
-	  if ((entry->object == object) && (entry->signal_num == signal_num))
+	  if ((entry->object == object) && (entry->signal_id == signal_id))
 	    {
 	      g_free (entry);
 
@@ -259,7 +259,7 @@ gtk_accelerator_table_check (GtkAcceleratorTable *table,
       if ((entry->modifiers & table->modifier_mask) ==
           (accelerator_mods & table->modifier_mask))
 	{
-	  gtk_signal_emit (entry->object, entry->signal_num);
+	  gtk_signal_emit (entry->object, entry->signal_id);
 	  return TRUE;
 	}
 
@@ -280,7 +280,7 @@ gtk_accelerator_table_check (GtkAcceleratorTable *table,
 	      (GTK_IS_WIDGET (entry->object) &&
 	       GTK_WIDGET_SENSITIVE (entry->object)))
 	    {
-	      gtk_signal_emit (entry->object, entry->signal_num);
+	      gtk_signal_emit (entry->object, entry->signal_id);
 	      return TRUE;
 	    }
 
diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c
index eceebdfa61..104af6f2d6 100644
--- a/gtk/gtkadjustment.c
+++ b/gtk/gtkadjustment.c
@@ -30,7 +30,7 @@ static void gtk_adjustment_class_init (GtkAdjustmentClass *klass);
 static void gtk_adjustment_init       (GtkAdjustment      *adjustment);
 
 
-static gint adjustment_signals[LAST_SIGNAL] = { 0 };
+static guint adjustment_signals[LAST_SIGNAL] = { 0 };
 
 
 guint
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 4a0a64e31d..ea303e0962 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -89,7 +89,7 @@ static void gtk_real_button_leave     (GtkButton        *button);
 
 
 static GtkContainerClass *parent_class;
-static gint button_signals[LAST_SIGNAL] = { 0 };
+static guint button_signals[LAST_SIGNAL] = { 0 };
 
 
 guint
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index 5319884d86..fb81c2f602 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -43,7 +43,7 @@ static void gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem      *chec
 
 
 static GtkMenuItemClass *parent_class = NULL;
-static gint check_menu_item_signals[LAST_SIGNAL] = { 0 };
+static guint check_menu_item_signals[LAST_SIGNAL] = { 0 };
 
 
 guint
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 6d696bfbfe..3cb3860e77 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -277,7 +277,7 @@ static void gtk_clist_marshal_signal_2 (GtkObject * object,
 static void add_style_data (GtkCList * clist);
 
 static GtkContainerClass *parent_class = NULL;
-static gint clist_signals[LAST_SIGNAL] = {0};
+static guint clist_signals[LAST_SIGNAL] = {0};
 
 
 guint
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index efc7091ee6..5ce2e8811b 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -164,7 +164,7 @@ static GtkVBoxClass *color_selection_parent_class = NULL;
 static GtkWindowClass *color_selection_dialog_parent_class = NULL;
 
 
-static gint color_selection_signals[LAST_SIGNAL] = {0};
+static guint color_selection_signals[LAST_SIGNAL] = {0};
 
 static const gchar	*value_index_key = "gtk-value-index";
 
diff --git a/gtk/gtkcombo.h b/gtk/gtkcombo.h
index 81d06f98f4..81522f46ae 100644
--- a/gtk/gtkcombo.h
+++ b/gtk/gtkcombo.h
@@ -43,8 +43,8 @@ struct _GtkCombo {
 	GtkWidget *popwin;
 	GtkWidget *list;
 
-	gint entry_change_id;
-	gint list_change_id;
+	guint entry_change_id;
+	guint list_change_id;
 
 	guint value_in_list:1;
 	guint ok_if_empty:1;
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index d2e2dbf6aa..c8a2ca6546 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -101,7 +101,7 @@ static void gtk_container_hide_all          (GtkWidget         *widget);
 
 
 
-static gint container_signals[LAST_SIGNAL] = { 0 };
+static guint container_signals[LAST_SIGNAL] = { 0 };
 
 static GtkWidgetClass *parent_class = NULL;
 
@@ -650,8 +650,8 @@ gtk_container_focus_tab (GtkContainer     *container,
   GtkWidget *child;
   GtkWidget *child2;
   GList *tmp_list;
-  gint length;
-  gint i, j;
+  guint length;
+  guint i, j;
 
   length = g_list_length (children);
 
@@ -724,8 +724,8 @@ gtk_container_focus_up_down (GtkContainer     *container,
   gint dist1, dist2;
   gint focus_x;
   gint focus_width;
-  gint length;
-  gint i, j;
+  guint length;
+  guint i, j;
 
   /* return failure if there isn't a focus child */
   if (container->focus_child)
@@ -834,8 +834,8 @@ gtk_container_focus_left_right (GtkContainer     *container,
   gint dist1, dist2;
   gint focus_y;
   gint focus_height;
-  gint length;
-  gint i, j;
+  guint length;
+  guint i, j;
 
   /* return failure if there isn't a focus child */
   if (container->focus_child)
diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c
index 3e1d74207f..0790917f63 100644
--- a/gtk/gtkcurve.c
+++ b/gtk/gtkcurve.c
@@ -39,7 +39,7 @@
 			 GDK_BUTTON1_MOTION_MASK)
 
 static GtkDrawingAreaClass *parent_class = NULL;
-static gint curve_type_changed_signal = 0;
+static guint curve_type_changed_signal = 0;
 
 
 /* forward declarations: */
diff --git a/gtk/gtkdata.c b/gtk/gtkdata.c
index 512e62067a..4af9a1a8e7 100644
--- a/gtk/gtkdata.c
+++ b/gtk/gtkdata.c
@@ -28,7 +28,7 @@ enum {
 static void gtk_data_class_init (GtkDataClass *klass);
 
 
-static gint data_signals[LAST_SIGNAL] = { 0 };
+static guint data_signals[LAST_SIGNAL] = { 0 };
 
 
 guint
diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index 1ae0659935..974b542d38 100644
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -87,7 +87,7 @@ static void gtk_editable_set_selection    (GtkEditable          *editable,
 					   gint               end);
 
 static GtkWidgetClass *parent_class = NULL;
-static gint editable_signals[LAST_SIGNAL] = { 0 };
+static guint editable_signals[LAST_SIGNAL] = { 0 };
 static GdkAtom ctext_atom = GDK_NONE;
 static GdkAtom text_atom = GDK_NONE;
 static GdkAtom clipboard_atom = GDK_NONE;
@@ -391,20 +391,20 @@ gtk_editable_set_selection (GtkEditable *editable,
 
 static gint
 gtk_editable_selection_clear (GtkWidget         *widget,
-			   GdkEventSelection *event)
+			      GdkEventSelection *event)
 {
   GtkEditable *editable;
-
+  
   g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_EDITABLE (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
-
+  
   /* Let the selection handling code know that the selection
    * has been changed, since we've overriden the default handler */
   gtk_selection_clear (widget, event);
-
+  
   editable = GTK_EDITABLE (widget);
-
+  
   if (event->selection == GDK_SELECTION_PRIMARY)
     {
       if (editable->has_selection)
@@ -419,7 +419,7 @@ gtk_editable_selection_clear (GtkWidget         *widget,
       g_free (editable->clipboard_text);
       editable->clipboard_text = NULL;
     }
-
+  
   return FALSE;
 }
 
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index a504240ec2..979e9d9e6c 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -111,7 +111,7 @@ static void gtk_entry_set_selection       (GtkEditable       *editable,
 					   gint               end);
 
 static GtkWidgetClass *parent_class = NULL;
-static gint entry_signals[LAST_SIGNAL] = { 0 };
+static guint entry_signals[LAST_SIGNAL] = { 0 };
 static GdkAtom ctext_atom = GDK_NONE;
 
 static GtkTextFunction control_keys[26] =
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index fe3ddd25b0..ab4f8c2923 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -71,7 +71,7 @@ static gint gtk_handle_box_delete_float   (GtkWidget         *widget,
 
 
 static GtkBinClass *parent_class;
-static gint         handle_box_signals[SIGNAL_LAST] = { 0 };
+static guint        handle_box_signals[SIGNAL_LAST] = { 0 };
 
 
 guint
diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c
index 44c1cec9b5..27865e84c9 100644
--- a/gtk/gtkinputdialog.c
+++ b/gtk/gtkinputdialog.c
@@ -98,7 +98,7 @@ static void gtk_input_dialog_fill_keys (GtkInputDialog *inputd,
 					GdkDeviceInfo *info);
 
 static GtkObjectClass *parent_class = NULL;
-static gint input_dialog_signals[LAST_SIGNAL] = { 0 };
+static guint input_dialog_signals[LAST_SIGNAL] = { 0 };
 
 static void
 gtk_input_dialog_marshal_signal1 (GtkObject      *object,
diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c
index 0afa4e3efa..6705f37219 100644
--- a/gtk/gtkitem.c
+++ b/gtk/gtkitem.c
@@ -34,7 +34,7 @@ static void gtk_item_unmap      (GtkWidget    *widget);
 static void gtk_item_realize    (GtkWidget    *widget);
 
 
-static gint item_signals[LAST_SIGNAL] = { 0 };
+static guint item_signals[LAST_SIGNAL] = { 0 };
 
 
 guint
diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index 948c7df563..67fc1fa568 100644
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -74,7 +74,7 @@ static void gtk_list_marshal_signal (GtkObject      *object,
 
 
 static GtkContainerClass *parent_class = NULL;
-static gint list_signals[LAST_SIGNAL] = { 0 };
+static guint list_signals[LAST_SIGNAL] = { 0 };
 
 
 guint
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 25de9353f0..cf695a5740 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -169,7 +169,7 @@ static GDebugKey gtk_debug_keys[] = {
   {"objects", GTK_DEBUG_OBJECTS}
 };
 
-static const int gtk_ndebug_keys = sizeof(gtk_debug_keys)/sizeof(GDebugKey);
+static const guint gtk_ndebug_keys = sizeof (gtk_debug_keys) / sizeof (GDebugKey);
 
 #endif /* G_ENABLE_DEBUG */
 
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 741dbc2ced..b861312694 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -276,7 +276,7 @@ gtk_menu_popup (GtkMenu             *menu,
 		GtkWidget           *parent_menu_item,
 		GtkMenuPositionFunc  func,
 		gpointer             data,
-		gint                 button,
+		guint                button,
 		guint32              activate_time)
 {
   g_return_if_fail (menu != NULL);
@@ -351,7 +351,7 @@ gtk_menu_get_active (GtkMenu *menu)
 
 void
 gtk_menu_set_active (GtkMenu *menu,
-		     gint     index)
+		     guint    index)
 {
   GtkWidget *child;
   GList *tmp_list;
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 4908536c11..4723db3173 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -78,12 +78,12 @@ void       gtk_menu_popup                 (GtkMenu             *menu,
 					   GtkWidget           *parent_menu_item,
 					   GtkMenuPositionFunc  func,
 					   gpointer             data,
-					   gint                 button,
+					   guint                button,
 					   guint32              activate_time);
 void       gtk_menu_popdown               (GtkMenu             *menu);
 GtkWidget* gtk_menu_get_active            (GtkMenu             *menu);
 void       gtk_menu_set_active            (GtkMenu             *menu,
-					   gint                 index);
+					   guint                index);
 void       gtk_menu_set_accelerator_table (GtkMenu             *menu,
 					   GtkAcceleratorTable *table);
 void	   gtk_menu_attach_to_widget	  (GtkMenu	       *menu,
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index a95391704b..582d33c279 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -69,7 +69,7 @@ static void gtk_menu_item_show_all       (GtkWidget        *widget);
 static void gtk_menu_item_hide_all       (GtkWidget        *widget);
 
 static GtkItemClass *parent_class;
-static gint menu_item_signals[LAST_SIGNAL] = { 0 };
+static guint menu_item_signals[LAST_SIGNAL] = { 0 };
 
 
 guint
@@ -439,7 +439,7 @@ gtk_menu_item_remove_accel (GtkWidget   *widget,
 			    const gchar *signal_name)
 {
   GtkMenuItem *menu_item;
-  gint signal_num;
+  guint signal_num;
 
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_MENU_ITEM (widget));
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 00fc40f79c..4a8ad8f112 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -42,7 +42,7 @@ struct _GtkMenuItem
 
   GtkWidget *submenu;
 
-  gint    accelerator_signal;
+  guint   accelerator_signal;
   gchar   accelerator_key;
   guint8  accelerator_mods;
   guint16 accelerator_size;
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 4c45ca7598..d063d0e92d 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -56,7 +56,7 @@ static gint gtk_menu_shell_is_item           (GtkMenuShell      *menu_shell,
 
 
 static GtkContainerClass *parent_class = NULL;
-static gint menu_shell_signals[LAST_SIGNAL] = { 0 };
+static guint menu_shell_signals[LAST_SIGNAL] = { 0 };
 
 
 guint
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 7214dbfd53..e622069553 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -140,7 +140,7 @@ static void gtk_notebook_menu_item_create    (GtkNotebook      *notebook,
 
 
 static GtkContainerClass *parent_class = NULL;
-static gint notebook_signals[LAST_SIGNAL] = { 0 };
+static guint notebook_signals[LAST_SIGNAL] = { 0 };
 
 guint
 gtk_notebook_get_type ()
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index e56fff9a58..4eeeb922a6 100644
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -80,21 +80,21 @@ GtkArg*               gtk_object_collect_args  (guint   *nargs,
 						va_list  args1,
 						va_list  args2);
 
-static gint object_signals[LAST_SIGNAL] = { 0 };
+static guint object_signals[LAST_SIGNAL] = { 0 };
 
 static gint object_data_init = TRUE;
 static GHashTable *object_data_ht = NULL;
 static GMemChunk *object_data_mem_chunk = NULL;
 static GSList *object_data_id_list = NULL;
-static gint object_data_id_index = 0;
+static guint object_data_id_index = 0;
 
 static GHashTable *arg_info_ht = NULL;
 
-static const char *user_data_key = "user_data";
+static const gchar *user_data_key = "user_data";
 
 
 #ifdef G_ENABLE_DEBUG
-static gint obj_count = 0;
+static guint obj_count = 0;
 static GHashTable *living_objs_ht = NULL;
 static void
 gtk_object_debug_foreach (gpointer key, gpointer value, gpointer user_data)
@@ -335,11 +335,11 @@ gtk_object_get_arg (GtkObject *object,
 
 void
 gtk_object_class_add_signals (GtkObjectClass *class,
-			      gint           *signals,
-			      gint            nsignals)
+			      guint          *signals,
+			      guint           nsignals)
 {
-  gint *new_signals;
-  gint i;
+  guint *new_signals;
+  guint i;
 
   g_return_if_fail (class != NULL);
 
@@ -362,18 +362,18 @@ gtk_object_class_add_signals (GtkObjectClass *class,
  *   results:
  *****************************************/
 
-gint
+guint
 gtk_object_class_add_user_signal (GtkObjectClass     *class,
 				  const gchar        *name,
 				  GtkSignalMarshaller marshaller,
 				  GtkType             return_val,
-				  gint                nparams,
+				  guint               nparams,
 				  ...)
 {
   GtkType *params;
   guint i;
   va_list args;
-  gint signal_id;
+  guint signal_id;
 
   g_return_val_if_fail (class != NULL, 0);
 
@@ -575,7 +575,7 @@ gtk_object_notify_weaks (gpointer data)
  *****************************************/
 
 GtkObject*
-gtk_object_new (guint type,
+gtk_object_new (GtkType type,
 		...)
 {
   GtkObject *obj;
@@ -608,7 +608,7 @@ gtk_object_new (guint type,
  *****************************************/
 
 GtkObject*
-gtk_object_newv (guint   type,
+gtk_object_newv (GtkType  type,
 		 guint    nargs,
 		 GtkArg *args)
 {
@@ -956,11 +956,11 @@ gtk_object_add_arg_type (const char *arg_name,
  *****************************************/
 
 GtkType
-gtk_object_get_arg_type (const char *arg_name)
+gtk_object_get_arg_type (const gchar *arg_name)
 {
   GtkArgInfo *info;
-  char buffer[1024];
-  char *t;
+  gchar buffer[1024];
+  gchar *t;
 
   if (!arg_info_ht)
     return GTK_TYPE_INVALID;
diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index 4897196012..44d218f84d 100644
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -151,11 +151,11 @@ struct _GtkObjectClass
   /* The signals this object class handles. "signals" is an
    *  array of signal ID's.
    */
-  gint *signals;
+  guint *signals;
 
   /* The number of signals listed in "signals".
    */
-  gint nsignals;
+  guint nsignals;
 
   /* The number of arguments per class.
    */
@@ -193,22 +193,22 @@ guint	gtk_object_get_type		(void);
 /* Append "signals" to those already defined in "class".
  */
 void	gtk_object_class_add_signals	(GtkObjectClass	*klass,
-					 gint           *signals,
-					 gint            nsignals);
+					 guint          *signals,
+					 guint           nsignals);
 
 /* Append a user defined signal without default handler to a class.
  */
-gint    gtk_object_class_add_user_signal (GtkObjectClass     *klass,
+guint   gtk_object_class_add_user_signal (GtkObjectClass     *klass,
 					  const gchar        *name,
 					  GtkSignalMarshaller marshaller,
 					  GtkType             return_val,
-					  gint                nparams,
+					  guint               nparams,
 					  ...);
 
-GtkObject*	gtk_object_new		(guint		type,
+GtkObject*	gtk_object_new		(GtkType	type,
 					 ...);
 
-GtkObject*	gtk_object_newv		(guint		type,
+GtkObject*	gtk_object_newv		(GtkType	type,
 					 guint		nargs,
 					 GtkArg		*args);
 void gtk_object_sink      (GtkObject        *object);
diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index ad59e8faf7..0cadce7d5f 100644
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -198,7 +198,7 @@ gtk_option_menu_remove_menu (GtkOptionMenu *option_menu)
 
 void
 gtk_option_menu_set_history (GtkOptionMenu *option_menu,
-			     gint           index)
+			     guint          index)
 {
   GtkWidget *menu_item;
 
diff --git a/gtk/gtkoptionmenu.h b/gtk/gtkoptionmenu.h
index bbddf23097..f8e9e5b6db 100644
--- a/gtk/gtkoptionmenu.h
+++ b/gtk/gtkoptionmenu.h
@@ -60,7 +60,7 @@ void       gtk_option_menu_set_menu    (GtkOptionMenu *option_menu,
 					GtkWidget     *menu);
 void       gtk_option_menu_remove_menu (GtkOptionMenu *option_menu);
 void       gtk_option_menu_set_history (GtkOptionMenu *option_menu,
-					gint           index);
+					guint          index);
 
 
 #ifdef __cplusplus
diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index df68aadb75..b578917b54 100644
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -38,19 +38,19 @@ typedef void (*GtkSignalMarshaller0) (GtkObject *object,
 struct _GtkSignalInfo
 {
   gchar *name;
-  gint object_type;
-  gint signal_type;
+  GtkType object_type;
+  guint signal_type;
 };
 
 struct _GtkSignal
 {
   GtkSignalInfo info;
-  gint function_offset;
+  guint function_offset;
   GtkSignalRunType run_type;
   GtkSignalMarshaller marshaller;
   GtkType return_val;
   GtkType *params;
-  gint nparams;
+  guint nparams;
 };
 
 struct _GtkHandler
@@ -77,21 +77,21 @@ struct _GtkHandlerInfo
   GtkType *param_types;
   GtkType return_val;
   GtkSignalRunType run_type;
-  gint nparams;
-  gint signal_type;
+  guint nparams;
+  guint signal_type;
 };
 
 struct _GtkEmission
 {
   GtkObject *object;
-  gint signal_type;
+  guint signal_type;
 };
 
 
 static void         gtk_signal_init            (void);
-static guint        gtk_signal_hash            (gint          *key);
-static gint         gtk_signal_compare         (gint          *a,
-						gint          *b);
+static guint        gtk_signal_hash            (guint         *key);
+static gint         gtk_signal_compare         (guint         *a,
+						guint         *b);
 static guint        gtk_signal_info_hash       (GtkSignalInfo *a);
 static gint         gtk_signal_info_compare    (GtkSignalInfo *a,
 						GtkSignalInfo *b);
@@ -102,12 +102,12 @@ static void         gtk_signal_handler_unref   (GtkHandler    *handler,
 static void         gtk_signal_handler_insert  (GtkObject     *object,
 						GtkHandler    *handler);
 static void         gtk_signal_real_emit       (GtkObject     *object,
-						gint           signal_type,
+						guint          signal_type,
 						va_list        args);
 static GtkHandler*  gtk_signal_get_handlers    (GtkObject     *object,
-						gint           signal_type);
-static gint         gtk_signal_connect_by_type (GtkObject     *object,
-						gint           signal_type,
+						guint          signal_type);
+static guint        gtk_signal_connect_by_type (GtkObject     *object,
+						guint          signal_type,
 						GtkSignalFunc  func,
 						gpointer       func_data,
 						GtkSignalDestroy destroy_func,
@@ -118,18 +118,18 @@ static GtkEmission* gtk_emission_new           (void);
 static void         gtk_emission_destroy       (GtkEmission    *emission);
 static void         gtk_emission_add           (GList         **emissions,
 						GtkObject      *object,
-						gint            signal_type);
+						guint           signal_type);
 static void         gtk_emission_remove        (GList         **emissions,
 						GtkObject      *object,
-						gint            signal_type);
+						guint           signal_type);
 static gint         gtk_emission_check         (GList          *emissions,
 						GtkObject      *object,
-						gint            signal_type);
+						guint           signal_type);
 static gint         gtk_handlers_run           (GtkHandler     *handlers,
 						GtkHandlerInfo *info,
 						gint            after);
 static void         gtk_params_get             (GtkArg         *params,
-						gint            nparams,
+						guint           nparams,
 						GtkType        *param_types,
 						GtkType         return_val,
 						va_list         args);
@@ -154,37 +154,37 @@ static GtkSignalMarshal marshal = NULL;
 static GtkSignalDestroy destroy = NULL;
 
 
-gint
+guint
 gtk_signal_new (const gchar         *name,
 		GtkSignalRunType     run_type,
-		gint                 object_type,
-		gint                 function_offset,
+		GtkType              object_type,
+		guint                function_offset,
 		GtkSignalMarshaller  marshaller,
 		GtkType              return_val,
-		gint                 nparams,
+		guint                nparams,
 		...)
 {
   GtkType *params;
   guint i;
   va_list args;
-  gint return_id;
-
+  guint return_id;
+  
   g_return_val_if_fail (nparams < 16, 0);
-
+  
   if (nparams > 0)
     {
       params = g_new (GtkType, nparams);
-
+      
       va_start (args, nparams);
-
+      
       for (i = 0; i < nparams; i++)
 	params[i] = va_arg (args, GtkType);
-
+      
       va_end (args);
     }
   else
     params = NULL;
-
+  
   return_id = gtk_signal_newv (name,
 			       run_type,
 			       object_type,
@@ -193,39 +193,39 @@ gtk_signal_new (const gchar         *name,
 			       return_val,
 			       nparams,
 			       params);
-
+  
   g_free (params);
-
+  
   return return_id;
 }
 
-gint
+guint
 gtk_signal_newv (const gchar         *name,
 		 GtkSignalRunType     run_type,
-		 gint                 object_type,
-		 gint                 function_offset,
+		 GtkType              object_type,
+		 guint                function_offset,
 		 GtkSignalMarshaller  marshaller,
 		 GtkType              return_val,
-		 gint                 nparams,
+		 guint                nparams,
 		 GtkType	     *params)
 {
   GtkSignal *signal;
   GtkSignalInfo info;
-  gint *type;
+  guint *type;
   guint i;
-
+  
   g_return_val_if_fail (name != NULL, 0);
   g_return_val_if_fail (marshaller != NULL, 0);
   g_return_val_if_fail (nparams < 16, 0);
   if (nparams)
     g_return_val_if_fail (params != NULL, 0);
-
+  
   if (initialize)
     gtk_signal_init ();
-
+  
   info.name = (char*)name;
   info.object_type = object_type;
-
+  
   type = g_hash_table_lookup (signal_info_hash_table, &info);
   if (type)
     {
@@ -233,7 +233,7 @@ gtk_signal_newv (const gchar         *name,
 		 name, gtk_type_name (object_type));
       return 0;
     }
-
+  
   signal = g_new (GtkSignal, 1);
   signal->info.name = g_strdup (name);
   signal->info.object_type = object_type;
@@ -243,35 +243,38 @@ gtk_signal_newv (const gchar         *name,
   signal->marshaller = marshaller;
   signal->return_val = return_val;
   signal->nparams = nparams;
-
+  
   if (nparams > 0)
     {
       signal->params = g_new (GtkType, nparams);
-
+      
       for (i = 0; i < nparams; i++)
 	signal->params[i] = params[i];
     }
   else
     signal->params = NULL;
-
+  
   g_hash_table_insert (signal_hash_table, &signal->info.signal_type, signal);
   g_hash_table_insert (signal_info_hash_table, &signal->info, &signal->info.signal_type);
-
+  
   return signal->info.signal_type;
 }
 
 GtkSignalQuery*
-gtk_signal_query (gint                 signal_num)
+gtk_signal_query (guint signal_id)
 {
   GtkSignalQuery *query;
   GtkSignal *signal;
-
-  signal = g_hash_table_lookup (signal_hash_table, &signal_num);
+  
+  g_return_val_if_fail (signal_id >= 1, NULL);
+  
+  signal = g_hash_table_lookup (signal_hash_table, &signal_id);
   if (signal)
     {
       query = g_new (GtkSignalQuery, 1);
-
+      
       query->object_type = signal->info.object_type;
+      query->signal_id = signal_id;
       query->signal_name = signal->info.name;
       query->is_user_signal = signal->function_offset == 0;
       query->run_type = signal->run_type;
@@ -281,66 +284,71 @@ gtk_signal_query (gint                 signal_num)
     }
   else
     query = NULL;
-
+  
   return query;
 }
 
-gint
+guint
 gtk_signal_lookup (const gchar *name,
-		   gint         object_type)
+		   GtkType      object_type)
 {
   GtkSignalInfo info;
-  gint *type;
-
+  
   g_return_val_if_fail (name != NULL, 0);
-
+  g_return_val_if_fail (gtk_type_is_a (object_type, GTK_TYPE_OBJECT), 0);
+  
   if (initialize)
     gtk_signal_init ();
-
+  
   info.name = (char*)name;
-
+  
   while (object_type)
     {
+      guint *type;
+      
       info.object_type = object_type;
-
+      
       type = g_hash_table_lookup (signal_info_hash_table, &info);
       if (type)
 	return *type;
-
+      
       object_type = gtk_type_parent (object_type);
     }
-
+  
   return 0;
 }
 
 gchar*
-gtk_signal_name (gint signal_num)
+gtk_signal_name (guint signal_id)
 {
   GtkSignal *signal;
-
-  signal = g_hash_table_lookup (signal_hash_table, &signal_num);
+  
+  g_return_val_if_fail (signal_id >= 1, NULL);
+  
+  signal = g_hash_table_lookup (signal_hash_table, &signal_id);
   if (signal)
     return signal->info.name;
-
+  
   return NULL;
 }
 
 void
 gtk_signal_emit (GtkObject *object,
-		 gint       signal_type,
+		 guint       signal_id,
 		 ...)
 {
   va_list args;
-
+  
   g_return_if_fail (object != NULL);
-
+  g_return_if_fail (signal_id >= 1);
+  
   if (initialize)
     gtk_signal_init ();
-
-  va_start (args, signal_type);
-
-  gtk_signal_real_emit (object, signal_type, args);
-
+  
+  va_start (args, signal_id);
+  
+  gtk_signal_real_emit (object, signal_id, args);
+  
   va_end (args);
 }
 
@@ -349,22 +357,23 @@ gtk_signal_emit_by_name (GtkObject       *object,
 			 const gchar     *name,
 			 ...)
 {
-  gint type;
+  guint type;
   va_list args;
-
+  
   g_return_if_fail (object != NULL);
-
+  g_return_if_fail (name != NULL);
+  
   if (initialize)
     gtk_signal_init ();
-
+  
   type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
-
-  if (type)
+  
+  if (type >= 1)
     {
       va_start (args, name);
-
+      
       gtk_signal_real_emit (object, type, args);
-
+      
       va_end (args);
     }
   else
@@ -376,33 +385,33 @@ gtk_signal_emit_by_name (GtkObject       *object,
 
 void
 gtk_signal_emit_stop (GtkObject *object,
-		      gint       signal_type)
+		      guint       signal_id)
 {
   g_return_if_fail (object != NULL);
-  g_return_if_fail (signal_type >= 1);
-
+  g_return_if_fail (signal_id >= 1);
+  
   if (initialize)
     gtk_signal_init ();
-
-  if (gtk_emission_check (current_emissions, object, signal_type))
-    gtk_emission_add (&stop_emissions, object, signal_type);
+  
+  if (gtk_emission_check (current_emissions, object, signal_id))
+    gtk_emission_add (&stop_emissions, object, signal_id);
   else
-    g_warning ("gtk_signal_emit_stop(): no current emission (%d) for object `%s'",
-	       signal_type, gtk_type_name (GTK_OBJECT_TYPE (object)));
+    g_warning ("gtk_signal_emit_stop(): no current emission (%u) for object `%s'",
+	       signal_id, gtk_type_name (GTK_OBJECT_TYPE (object)));
 }
 
 void
 gtk_signal_emit_stop_by_name (GtkObject       *object,
 			      const gchar     *name)
 {
-  gint type;
-
+  guint type;
+  
   g_return_if_fail (object != NULL);
   g_return_if_fail (name != NULL);
-
+  
   if (initialize)
     gtk_signal_init ();
-
+  
   type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
   if (type)
     gtk_signal_emit_stop (object, type);
@@ -411,19 +420,19 @@ gtk_signal_emit_stop_by_name (GtkObject       *object,
 	       name, gtk_type_name (GTK_OBJECT_TYPE (object)));
 }
 
-gint
+guint
 gtk_signal_connect (GtkObject     *object,
 		    const gchar   *name,
 		    GtkSignalFunc  func,
 		    gpointer       func_data)
 {
-  gint type;
-
+  guint type;
+  
   g_return_val_if_fail (object != NULL, 0);
-
+  
   if (initialize)
     gtk_signal_init ();
-
+  
   type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
   if (!type)
     {
@@ -431,25 +440,25 @@ gtk_signal_connect (GtkObject     *object,
 		 name, gtk_type_name (GTK_OBJECT_TYPE (object)));
       return 0;
     }
-
+  
   return gtk_signal_connect_by_type (object, type, 
 				     func, func_data, NULL,
 				     FALSE, FALSE, FALSE);
 }
 
-gint
+guint
 gtk_signal_connect_after (GtkObject     *object,
 			  const gchar   *name,
 			  GtkSignalFunc  func,
 			  gpointer       func_data)
 {
-  gint type;
-
+  guint type;
+  
   g_return_val_if_fail (object != NULL, 0);
-
+  
   if (initialize)
     gtk_signal_init ();
-
+  
   type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
   if (!type)
     {
@@ -457,15 +466,15 @@ gtk_signal_connect_after (GtkObject     *object,
 		 name, gtk_type_name (GTK_OBJECT_TYPE (object)));
       return 0;
     }
-
+  
   return gtk_signal_connect_by_type (object, type, 
 				     func, func_data, NULL,
 				     FALSE, TRUE, FALSE);
 }
 
-gint   
+guint   
 gtk_signal_connect_full (GtkObject           *object,
-			 gchar               *name,
+			 const gchar         *name,
 			 GtkSignalFunc        func,
 			 GtkCallbackMarshal   marshal,
 			 gpointer             func_data,
@@ -473,13 +482,13 @@ gtk_signal_connect_full (GtkObject           *object,
 			 gint                 object_signal,
 			 gint                 after)
 {
-  gint type;
-
+  guint type;
+  
   g_return_val_if_fail (object != NULL, 0);
-
+  
   if (initialize)
     gtk_signal_init ();
-
+  
   type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
   if (!type)
     {
@@ -487,7 +496,7 @@ gtk_signal_connect_full (GtkObject           *object,
 		 name, gtk_type_name (GTK_OBJECT_TYPE (object)));
       return 0;
     }
-
+  
   if (marshal)
     return gtk_signal_connect_by_type (object, type, (GtkSignalFunc) marshal, 
 				       func_data, destroy_func, 
@@ -498,9 +507,9 @@ gtk_signal_connect_full (GtkObject           *object,
 				       object_signal, after, FALSE);
 }
 
-gint
+guint
 gtk_signal_connect_interp (GtkObject         *object,
-			   gchar             *name,
+			   const gchar       *name,
 			   GtkCallbackMarshal func,
 			   gpointer           func_data,
 			   GtkDestroyNotify   destroy_func,
@@ -510,20 +519,20 @@ gtk_signal_connect_interp (GtkObject         *object,
 				  func_data, destroy_func, FALSE, after);
 }
 
-gint
+guint
 gtk_signal_connect_object (GtkObject     *object,
 			   const gchar   *name,
 			   GtkSignalFunc  func,
 			   GtkObject     *slot_object)
 {
-  gint type;
-
+  guint type;
+  
   g_return_val_if_fail (object != NULL, 0);
   /* slot_object needs to be treated as ordinary pointer */
-
+  
   if (initialize)
     gtk_signal_init ();
-
+  
   type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
   if (!type)
     {
@@ -531,25 +540,25 @@ gtk_signal_connect_object (GtkObject     *object,
 		 name, gtk_type_name (GTK_OBJECT_TYPE (object)));
       return 0;
     }
-
+  
   return gtk_signal_connect_by_type (object, type, 
 				     func, slot_object, NULL,
 				     TRUE, FALSE, FALSE);
 }
 
-gint
+guint
 gtk_signal_connect_object_after (GtkObject     *object,
 				 const gchar   *name,
 				 GtkSignalFunc  func,
 				 GtkObject     *slot_object)
 {
-  gint type;
-
+  guint type;
+  
   g_return_val_if_fail (object != NULL, 0);
-
+  
   if (initialize)
     gtk_signal_init ();
-
+  
   type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
   if (!type)
     {
@@ -557,7 +566,7 @@ gtk_signal_connect_object_after (GtkObject     *object,
 		 name, gtk_type_name (GTK_OBJECT_TYPE (object)));
       return 0;
     }
-
+  
   return gtk_signal_connect_by_type (object, type, 
 				     func, slot_object, NULL,
 				     TRUE, TRUE, FALSE);
@@ -567,22 +576,22 @@ typedef struct _GtkDisconnectInfo       GtkDisconnectInfo;
 struct _GtkDisconnectInfo
 {
   GtkObject     *object1;
-  gint          disconnect_handler1;
-  gint          signal_handler;
+  guint          disconnect_handler1;
+  guint          signal_handler;
   GtkObject     *object2;
-  gint          disconnect_handler2;
+  guint          disconnect_handler2;
 };
 
-static gint
+static guint
 gtk_alive_disconnecter (GtkDisconnectInfo *info)
 {
   g_return_val_if_fail (info != NULL, 0);
-
+  
   gtk_signal_disconnect (info->object1, info->disconnect_handler1);
   gtk_signal_disconnect (info->object1, info->signal_handler);
   gtk_signal_disconnect (info->object2, info->disconnect_handler2);
   g_free (info);
-
+  
   return 0;
 }
 
@@ -594,18 +603,18 @@ gtk_signal_connect_while_alive (GtkObject        *object,
 				GtkObject        *alive_object)
 {
   GtkDisconnectInfo *info;
-
+  
   g_return_if_fail (object != NULL);
   g_return_if_fail (GTK_IS_OBJECT (object));
   g_return_if_fail (signal != NULL);
   g_return_if_fail (func != NULL);
   g_return_if_fail (alive_object != NULL);
   g_return_if_fail (GTK_IS_OBJECT (alive_object));
-
+  
   info = g_new (GtkDisconnectInfo, 1);
   info->object1 = object;
   info->object2 = alive_object;
-
+  
   info->signal_handler = gtk_signal_connect (object, signal, func, func_data);
   info->disconnect_handler1 = gtk_signal_connect_object (info->object1,
 							 "destroy",
@@ -624,18 +633,18 @@ gtk_signal_connect_object_while_alive (GtkObject        *object,
 				       GtkObject        *alive_object)
 {
   GtkDisconnectInfo *info;
-
+  
   g_return_if_fail (object != NULL);
   g_return_if_fail (GTK_IS_OBJECT (object));
   g_return_if_fail (signal != NULL);
   g_return_if_fail (func != NULL);
   g_return_if_fail (alive_object != NULL);
   g_return_if_fail (GTK_IS_OBJECT (alive_object));
-
+  
   info = g_new (GtkDisconnectInfo, 1);
   info->object1 = object;
   info->object2 = alive_object;
-
+  
   info->signal_handler = gtk_signal_connect_object (object, signal, func, alive_object);
   info->disconnect_handler1 = gtk_signal_connect_object (info->object1,
 							 "destroy",
@@ -649,18 +658,18 @@ gtk_signal_connect_object_while_alive (GtkObject        *object,
 
 void
 gtk_signal_disconnect (GtkObject *object,
-		       gint       an_id)
+		       guint      handler_id)
 {
   GtkHandler *handler;
-
+  
   g_return_if_fail (object != NULL);
-  g_return_if_fail (an_id > 0);
-
+  g_return_if_fail (handler_id > 0);
+  
   handler = gtk_object_get_data (object, handler_key);
-
+  
   while (handler)
     {
-      if (handler->id == an_id)
+      if (handler->id == handler_id)
 	{
 	  handler->id = 0;
 	  handler->blocked = TRUE;
@@ -669,8 +678,8 @@ gtk_signal_disconnect (GtkObject *object,
 	}
       handler = handler->next;
     }
-
-  g_warning ("gtk_signal_disconnect(): could not find handler (%d)", an_id);
+  
+  g_warning ("gtk_signal_disconnect(): could not find handler (%u)", handler_id);
 }
 
 void
@@ -679,16 +688,16 @@ gtk_signal_disconnect_by_data (GtkObject *object,
 {
   GtkHandler *handler;
   gint found_one;
-
+  
   g_return_if_fail (object != NULL);
-
+  
   found_one = FALSE;
   handler = gtk_object_get_data (object, handler_key);
-
+  
   while (handler)
     {
       GtkHandler *handler_next;
-
+      
       handler_next = handler->next;
       if (handler->func_data == data &&
 	  handler->id > 0)
@@ -700,34 +709,34 @@ gtk_signal_disconnect_by_data (GtkObject *object,
 	}
       handler = handler_next;
     }
-
+  
   if (!found_one)
     g_warning ("gtk_signal_disconnect_by_data(): could not find handler containing data (0x%0lX)", (long) data);
 }
 
 void
 gtk_signal_handler_block (GtkObject *object,
-			  gint       an_id)
+			  guint	     handler_id)
 {
   GtkHandler *tmp;
-
+  
   g_return_if_fail (object != NULL);
-  g_return_if_fail (an_id > 0);
-
+  g_return_if_fail (handler_id > 0);
+  
   tmp = gtk_object_get_data (object, handler_key);
-
+  
   while (tmp)
     {
-      if (tmp->id == an_id)
+      if (tmp->id == handler_id)
 	{
 	  tmp->blocked = TRUE;
 	  return;
 	}
-
+      
       tmp = tmp->next;
     }
-
-  g_warning ("gtk_signal_handler_block(): could not find handler (%d)", an_id);
+  
+  g_warning ("gtk_signal_handler_block(): could not find handler (%u)", handler_id);
 }
 
 void
@@ -736,15 +745,15 @@ gtk_signal_handler_block_by_data (GtkObject *object,
 {
   GtkHandler *handler;
   gint found_one;
-
+  
   g_return_if_fail (object != NULL);
-
+  
   if (initialize)
     gtk_signal_init ();
-
+  
   found_one = FALSE;
   handler = gtk_object_get_data (object, handler_key);
-
+  
   while (handler)
     {
       if (handler->func_data == data &&
@@ -753,40 +762,40 @@ gtk_signal_handler_block_by_data (GtkObject *object,
 	  found_one = TRUE;
 	  handler->blocked = TRUE;
 	}
-
+      
       handler = handler->next;
     }
-
+  
   if (!found_one)
     g_warning ("gtk_signal_handler_block_by_data(): could not find handler containing data (0x%0lX)", (long) data);
 }
 
 void
 gtk_signal_handler_unblock (GtkObject *object,
-			    gint       an_id)
+			    guint      handler_id)
 {
   GtkHandler *handler;
-
+  
   g_return_if_fail (object != NULL);
-  g_return_if_fail (an_id > 0);
-
+  g_return_if_fail (handler_id > 0);
+  
   if (initialize)
     gtk_signal_init ();
-
+  
   handler = gtk_object_get_data (object, handler_key);
-
+  
   while (handler)
     {
-      if (handler->id == an_id)
+      if (handler->id == handler_id)
 	{
 	  handler->blocked = FALSE;
 	  return;
 	}
-
+      
       handler = handler->next;
     }
-
-  g_warning ("gtk_signal_handler_unblock(): could not find handler (%d)", an_id);
+  
+  g_warning ("gtk_signal_handler_unblock(): could not find handler (%u)", handler_id);
 }
 
 void
@@ -795,15 +804,15 @@ gtk_signal_handler_unblock_by_data (GtkObject *object,
 {
   GtkHandler *handler;
   gint found_one;
-
+  
   g_return_if_fail (object != NULL);
-
+  
   if (initialize)
     gtk_signal_init ();
-
+  
   found_one = FALSE;
   handler = gtk_object_get_data (object, handler_key);
-
+  
   while (handler)
     {
       if (handler->func_data == data &&
@@ -812,10 +821,10 @@ gtk_signal_handler_unblock_by_data (GtkObject *object,
 	  found_one = TRUE;
 	  handler->blocked = FALSE;
 	}
-
+      
       handler = handler->next;
     }
-
+  
   if (!found_one)
     g_warning ("gtk_signal_handler_unblock_by_data(): could not find handler containing data (0x%0lX)", (long) data);
 }
@@ -824,12 +833,12 @@ void
 gtk_signal_handlers_destroy (GtkObject *object)
 {
   GtkHandler *handler;
-
+  
   /* we make the "optimization" of destroying the first handler in the last
    * place, since we don't want gtk_signal_handler_unref() to reset the objects
    * handler_key data on each removal
    */
-
+  
   handler = gtk_object_get_data (object, handler_key);
   if (handler)
     {
@@ -837,7 +846,7 @@ gtk_signal_handlers_destroy (GtkObject *object)
       while (handler)
 	{
 	  GtkHandler *next;
-
+	  
 	  next = handler->next;
 	  gtk_signal_handler_unref (handler, object);
 	  handler = next;
@@ -854,9 +863,9 @@ gtk_signal_default_marshaller (GtkObject      *object,
 			       GtkArg         *params)
 {
   GtkSignalMarshaller0 rfunc;
-
+  
   rfunc = (GtkSignalMarshaller0) func;
-
+  
   (* rfunc) (object, func_data);
 }
 
@@ -883,14 +892,14 @@ gtk_signal_init ()
 }
 
 static guint
-gtk_signal_hash (gint *key)
+gtk_signal_hash (guint *key)
 {
-  return (guint) *key;
+  return *key;
 }
 
 static gint
-gtk_signal_compare (gint *a,
-		    gint *b)
+gtk_signal_compare (guint *a,
+		    guint *b)
 {
   return (*a == *b);
 }
@@ -913,13 +922,13 @@ static GtkHandler*
 gtk_signal_handler_new ()
 {
   GtkHandler *handler;
-
+  
   if (!handler_mem_chunk)
     handler_mem_chunk = g_mem_chunk_new ("handler mem chunk", sizeof (GtkHandler),
 					 1024, G_ALLOC_AND_FREE);
-
+  
   handler = g_chunk_new (GtkHandler, handler_mem_chunk);
-
+  
   handler->id = 0;
   handler->ref_count = 1;
   handler->signal_type = 0;
@@ -932,7 +941,7 @@ gtk_signal_handler_new ()
   handler->destroy_func = NULL;
   handler->prev = NULL;
   handler->next = NULL;
-
+  
   return handler;
 }
 
@@ -948,11 +957,11 @@ gtk_signal_handler_unref (GtkHandler *handler,
 {
   if (!handler->ref_count)
     {
-      /* FIXME: i wanna get removed some when (maybe at gtk+-1.0?) */
+      /* FIXME: i wanna get removed some when */
       g_warning ("gtk_signal_handler_unref(): handler with ref_count==0!");
       return;
     }
-
+  
   handler->ref_count -= 1;
   if (handler->ref_count == 0)
     {
@@ -960,15 +969,15 @@ gtk_signal_handler_unref (GtkHandler *handler,
 	(* destroy) (handler->func_data);
       else if (handler->destroy_func)
 	(* handler->destroy_func) (handler->func_data);
-
-
+      
+      
       if (handler->prev)
 	handler->prev->next = handler->next;
       else
 	gtk_object_set_data (object, handler_key, handler->next);
       if (handler->next)
 	handler->next->prev = handler->prev;
-
+      
       g_mem_chunk_free (handler_mem_chunk, handler);
     }
 }
@@ -1001,7 +1010,7 @@ gtk_signal_handler_insert (GtkObject  *object,
 	    handler->next = tmp;
 	    break;
 	  }
-
+	
 	if (!tmp->next)
 	  {
 	    tmp->next = handler;
@@ -1014,7 +1023,7 @@ gtk_signal_handler_insert (GtkObject  *object,
 
 static void
 gtk_signal_real_emit (GtkObject *object,
-		      gint       signal_type,
+		      guint      signal_type,
 		      va_list    args)
 {
   GtkSignal *signal;
@@ -1023,9 +1032,6 @@ gtk_signal_real_emit (GtkObject *object,
   guchar **signal_func_offset;
   GtkArg         params[MAX_PARAMS];
   
-  g_return_if_fail (object != NULL);
-  g_return_if_fail (signal_type >= 1);
-  
   signal = g_hash_table_lookup (signal_hash_table, &signal_type);
   g_return_if_fail (signal != NULL);
   g_return_if_fail (gtk_type_is_a (GTK_OBJECT_TYPE (object),
@@ -1103,40 +1109,40 @@ done:
 
 static GtkHandler*
 gtk_signal_get_handlers (GtkObject *object,
-			 gint       signal_type)
+			 guint      signal_type)
 {
   GtkHandler *handlers;
-
+  
   g_return_val_if_fail (object != NULL, NULL);
   g_return_val_if_fail (signal_type >= 1, NULL);
-
+  
   handlers = gtk_object_get_data (object, handler_key);
-
+  
   while (handlers)
     {
       if (handlers->signal_type == signal_type)
 	return handlers;
       handlers = handlers->next;
     }
-
+  
   return NULL;
 }
 
 guint
 gtk_signal_handler_pending (GtkObject           *object,
-			    gint                 signal_type,
+			    guint                signal_id,
 			    gboolean		 may_be_blocked)
 {
   GtkHandler *handlers;
   guint handler_id;
   
   g_return_val_if_fail (object != NULL, 0);
-  g_return_val_if_fail (signal_type >= 1, 0);
+  g_return_val_if_fail (signal_id >= 1, 0);
   
-  handlers = gtk_signal_get_handlers (object, signal_type);
+  handlers = gtk_signal_get_handlers (object, signal_id);
   
   handler_id = 0;
-  while (handlers && handlers->signal_type == signal_type)
+  while (handlers && handlers->signal_type == signal_id)
     {
       if (handlers->id > 0 &&
 	  (may_be_blocked ||
@@ -1152,9 +1158,9 @@ gtk_signal_handler_pending (GtkObject           *object,
   return handler_id;
 }
 
-static gint
+static guint
 gtk_signal_connect_by_type (GtkObject       *object,
-			    gint             signal_type,
+			    guint            signal_type,
 			    GtkSignalFunc    func,
 			    gpointer         func_data,
 			    GtkSignalDestroy destroy_func,
@@ -1165,10 +1171,10 @@ gtk_signal_connect_by_type (GtkObject       *object,
   GtkObjectClass *class;
   GtkHandler *handler;
   gint found_it;
-
+  
   g_return_val_if_fail (object != NULL, 0);
   g_return_val_if_fail (object->klass != NULL, 0);
-
+  
   /* Search through the signals for this object and make
    *  sure the one we are adding is valid. We need to perform
    *  the lookup on the objects parents as well. If it isn't
@@ -1180,7 +1186,7 @@ gtk_signal_connect_by_type (GtkObject       *object,
     {
       GtkType parent;
       gint *object_signals;
-      gint  nsignals;
+      guint nsignals;
       guint i;
       
       object_signals = class->signals;
@@ -1202,12 +1208,12 @@ gtk_signal_connect_by_type (GtkObject       *object,
   
   if (!found_it)
     {
-      g_warning ("gtk_signal_connect_by_type(): could not find signal type (%d) in signal list of `%s'",
+      g_warning ("gtk_signal_connect_by_type(): could not find signal id (%u) in the `%s' class ancestry",
 		 signal_type,
 		 gtk_type_name (class->type));
       return 0;
     }
-
+  
   handler = gtk_signal_handler_new ();
   handler->id = next_handler_id++;
   handler->signal_type = signal_type;
@@ -1217,7 +1223,7 @@ gtk_signal_connect_by_type (GtkObject       *object,
   handler->destroy_func = destroy_func;
   handler->after = after != FALSE;
   handler->no_marshal = no_marshal;
-
+  
   gtk_signal_handler_insert (object, handler);
   return handler->id;
 }
@@ -1226,16 +1232,16 @@ static GtkEmission*
 gtk_emission_new ()
 {
   GtkEmission *emission;
-
+  
   if (!emission_mem_chunk)
     emission_mem_chunk = g_mem_chunk_new ("emission mem chunk", sizeof (GtkEmission),
 					  1024, G_ALLOC_AND_FREE);
-
+  
   emission = g_chunk_new (GtkEmission, emission_mem_chunk);
-
+  
   emission->object = NULL;
   emission->signal_type = 0;
-
+  
   return emission;
 }
 
@@ -1248,36 +1254,35 @@ gtk_emission_destroy (GtkEmission *emission)
 static void
 gtk_emission_add (GList     **emissions,
 		  GtkObject  *object,
-		  gint        signal_type)
+		  guint       signal_type)
 {
   GtkEmission *emission;
-
+  
   g_return_if_fail (emissions != NULL);
   g_return_if_fail (object != NULL);
-
+  
   emission = gtk_emission_new ();
   emission->object = object;
   emission->signal_type = signal_type;
-
+  
   *emissions = g_list_prepend (*emissions, emission);
 }
 
 static void
 gtk_emission_remove (GList     **emissions,
 		     GtkObject  *object,
-		     gint        signal_type)
+		     guint       signal_type)
 {
   GtkEmission *emission;
   GList *tmp;
-
+  
   g_return_if_fail (emissions != NULL);
-  g_return_if_fail (object != NULL);
-
+  
   tmp = *emissions;
   while (tmp)
     {
       emission = tmp->data;
-
+      
       if ((emission->object == object) &&
 	  (emission->signal_type == signal_type))
 	{
@@ -1286,7 +1291,7 @@ gtk_emission_remove (GList     **emissions,
 	  g_list_free (tmp);
 	  break;
 	}
-
+      
       tmp = tmp->next;
     }
 }
@@ -1294,19 +1299,17 @@ gtk_emission_remove (GList     **emissions,
 static gint
 gtk_emission_check (GList     *emissions,
 		    GtkObject *object,
-		    gint       signal_type)
+		    guint      signal_type)
 {
   GtkEmission *emission;
   GList *tmp;
-
-  g_return_val_if_fail (object != NULL, FALSE);
-
+  
   tmp = emissions;
   while (tmp)
     {
       emission = tmp->data;
       tmp = tmp->next;
-
+      
       if ((emission->object == object) &&
 	  (emission->signal_type == signal_type))
 	return TRUE;
@@ -1319,17 +1322,11 @@ gtk_handlers_run (GtkHandler     *handlers,
 		  GtkHandlerInfo *info,
 		  gint            after)
 {
-  while (handlers)
+  while (handlers && handlers->signal_type == info->signal_type)
     {
       GtkHandler *handlers_next;
-  
-      gtk_signal_handler_ref (handlers);
       
-      if (handlers->signal_type != info->signal_type)
-	{
-	  gtk_signal_handler_unref (handlers, info->object);
-	  return 0;
-	}
+      gtk_signal_handler_ref (handlers);
       
       if (!handlers->blocked && (handlers->after == after))
 	{
@@ -1392,18 +1389,18 @@ gtk_handlers_run (GtkHandler     *handlers,
 
 static void
 gtk_params_get (GtkArg         *params,
-		gint            nparams,
+		guint           nparams,
 		GtkType        *param_types,
 		GtkType         return_val,
 		va_list         args)
 {
-  int i;
-
+  gint i;
+  
   for (i = 0; i < nparams; i++)
     {
       params[i].type = param_types[i];
       params[i].name = NULL;
-
+      
       switch (GTK_FUNDAMENTAL_TYPE (param_types[i]))
 	{
 	case GTK_TYPE_INVALID:
@@ -1470,25 +1467,27 @@ gtk_params_get (GtkArg         *params,
 	  GTK_VALUE_C_CALLBACK(params[i]).func_data = va_arg (args, gpointer);
 	  break;
 	case GTK_TYPE_ARGS:
-	  GTK_VALUE_ARGS(params[i]).n_args = va_arg (args, int);
+	  GTK_VALUE_ARGS(params[i]).n_args = va_arg (args, gint);
 	  GTK_VALUE_ARGS(params[i]).args = va_arg (args, GtkArg*);
 	  break;
 	case GTK_TYPE_OBJECT:
 	  GTK_VALUE_OBJECT(params[i]) = va_arg (args, GtkObject*);
-	  g_assert (GTK_VALUE_OBJECT(params[i]) == NULL ||
-		    GTK_CHECK_TYPE (GTK_VALUE_OBJECT(params[i]),
-				    params[i].type));
+	  if (GTK_VALUE_OBJECT(params[i]) != NULL &&
+	      !GTK_CHECK_TYPE (GTK_VALUE_OBJECT(params[i]), params[i].type))
+	    g_warning ("signal arg `%s' is not of type `%s'",
+		       gtk_type_name (GTK_OBJECT_TYPE (GTK_VALUE_OBJECT(params[i]))),
+		       gtk_type_name (params[i].type));
 	  break;
 	default:
-	  g_error ("unsupported type %s in signal arg",
+	  g_error ("unsupported type `%s' in signal arg",
 		   gtk_type_name (params[i].type));
 	  break;
 	}
     }
-
+  
   params[i].type = return_val;
   params[i].name = NULL;
-
+  
   switch (GTK_FUNDAMENTAL_TYPE (return_val))
     {
     case GTK_TYPE_INVALID:
@@ -1543,7 +1542,7 @@ gtk_params_get (GtkArg         *params,
     case GTK_TYPE_C_CALLBACK:
     case GTK_TYPE_ARGS:
     default:
-      g_error ("unsupported type %s in signal return",
+      g_error ("unsupported type `%s' in signal return",
 	       gtk_type_name (return_val));
       break;
     }
diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h
index dd0c3eb1d8..571ca3c261 100644
--- a/gtk/gtksignal.h
+++ b/gtk/gtksignal.h
@@ -8,7 +8,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
@@ -28,27 +28,28 @@
 extern "C" {
 #endif /* __cplusplus */
 
-
+  
 #ifdef offsetof
 #define GTK_SIGNAL_OFFSET(t, f) ((int) offsetof (t, f))
 #else /* offsetof */
 #define GTK_SIGNAL_OFFSET(t, f) ((int) ((char*) &((t*) 0)->f))
 #endif /* offsetof */
-
   
-typedef void (*GtkSignalMarshal)    (GtkObject      *object,
-				     gpointer        data,
-				     gint            nparams,
-				     GtkArg         *args,
-				     GtkType        *arg_types,
-				     GtkType         return_type);
-typedef void (*GtkSignalDestroy)    (gpointer        data);
+  
+typedef void (*GtkSignalMarshal)    (GtkObject	    *object,
+				     gpointer	     data,
+				     guint	     nparams,
+				     GtkArg	    *args,
+				     GtkType	    *arg_types,
+				     GtkType	     return_type);
+typedef void (*GtkSignalDestroy)    (gpointer	     data);
 
 typedef struct _GtkSignalQuery		GtkSignalQuery;
 
 struct	_GtkSignalQuery
 {
-  gint		   object_type;
+  GtkType	   object_type;
+  guint		   signal_id;
   const gchar	  *signal_name;
   gboolean	   is_user_signal;
   GtkSignalRunType run_type;
@@ -57,104 +58,104 @@ struct	_GtkSignalQuery
   const GtkType	  *params;
 };
 
-gint   gtk_signal_new                     (const gchar         *name,
-					   GtkSignalRunType     run_type,
-					   gint                 object_type,
-					   gint                 function_offset,
-					   GtkSignalMarshaller  marshaller,
-					   GtkType              return_val,
-					   gint                 nparams,
+guint  gtk_signal_new			  (const gchar	       *name,
+					   GtkSignalRunType	run_type,
+					   GtkType		object_type,
+					   guint		function_offset,
+					   GtkSignalMarshaller	marshaller,
+					   GtkType		return_val,
+					   guint		nparams,
 					   ...);
-gint   gtk_signal_newv                    (const gchar         *name,
-					   GtkSignalRunType     run_type,
-					   gint                 object_type,
-					   gint                 function_offset,
-					   GtkSignalMarshaller  marshaller,
-					   GtkType              return_val,
-					   gint                 nparams,
+guint  gtk_signal_newv			  (const gchar	       *name,
+					   GtkSignalRunType	run_type,
+					   GtkType		object_type,
+					   guint		function_offset,
+					   GtkSignalMarshaller	marshaller,
+					   GtkType		return_val,
+					   guint		nparams,
 					   GtkType	       *params);
-gint   gtk_signal_lookup                  (const gchar         *name,
-					   gint                 object_type);
-gchar* gtk_signal_name                    (gint                 signal_num);
-void   gtk_signal_emit                    (GtkObject           *object,
-					   gint                 signal_type,
+guint  gtk_signal_lookup		  (const gchar	       *name,
+					   GtkType		object_type);
+gchar* gtk_signal_name			  (guint		signal_id);
+void   gtk_signal_emit			  (GtkObject	       *object,
+					   guint		signal_id,
 					   ...);
-void   gtk_signal_emit_by_name            (GtkObject           *object,
-					   const gchar         *name,
+void   gtk_signal_emit_by_name		  (GtkObject	       *object,
+					   const gchar	       *name,
 					   ...);
-void   gtk_signal_emit_stop               (GtkObject           *object,
-					   gint                 signal_type);
-void   gtk_signal_emit_stop_by_name       (GtkObject           *object,
-					   const gchar         *name);
-gint   gtk_signal_connect                 (GtkObject           *object,
-					   const gchar         *name,
-					   GtkSignalFunc        func,
-					   gpointer             func_data);
-gint   gtk_signal_connect_after           (GtkObject           *object,
-					   const gchar         *name,
-					   GtkSignalFunc        func,
-					   gpointer             func_data);
-gint   gtk_signal_connect_object          (GtkObject           *object,
-					   const gchar         *name,
-					   GtkSignalFunc        func,
-					   GtkObject           *slot_object);
-gint   gtk_signal_connect_object_after    (GtkObject           *object,
-					   const gchar         *name,
-					   GtkSignalFunc        func,
-					   GtkObject           *slot_object);
-gint   gtk_signal_connect_full            (GtkObject           *object,
-					   gchar               *name,
-					   GtkSignalFunc        func,
-					   GtkCallbackMarshal   marshal,
-					   gpointer             data,
-					   GtkDestroyNotify     destroy_func,
-					   gint                 object_signal,
-					   gint                 after);
-gint   gtk_signal_connect_interp          (GtkObject           *object,
-					   gchar               *name,
-					   GtkCallbackMarshal   func,
-					   gpointer             data,
-					   GtkDestroyNotify     destroy_func,
-					   gint                 after);
-
-void   gtk_signal_connect_object_while_alive (GtkObject        *object,
+void   gtk_signal_emit_stop		  (GtkObject	       *object,
+					   guint		signal_id);
+void   gtk_signal_emit_stop_by_name	  (GtkObject	       *object,
+					   const gchar	       *name);
+guint  gtk_signal_connect		  (GtkObject	       *object,
+					   const gchar	       *name,
+					   GtkSignalFunc	func,
+					   gpointer		func_data);
+guint  gtk_signal_connect_after		  (GtkObject	       *object,
+					   const gchar	       *name,
+					   GtkSignalFunc	func,
+					   gpointer		func_data);
+guint  gtk_signal_connect_object	  (GtkObject	       *object,
+					   const gchar	       *name,
+					   GtkSignalFunc	func,
+					   GtkObject	       *slot_object);
+guint  gtk_signal_connect_object_after	  (GtkObject	       *object,
+					   const gchar	       *name,
+					   GtkSignalFunc	func,
+					   GtkObject	       *slot_object);
+guint  gtk_signal_connect_full		  (GtkObject	       *object,
+					   const gchar	       *name,
+					   GtkSignalFunc	func,
+					   GtkCallbackMarshal	marshal,
+					   gpointer		data,
+					   GtkDestroyNotify	destroy_func,
+					   gint			object_signal,
+					   gint			after);
+guint  gtk_signal_connect_interp	  (GtkObject	       *object,
+					   const gchar	       *name,
+					   GtkCallbackMarshal	func,
+					   gpointer		data,
+					   GtkDestroyNotify	destroy_func,
+					   gint			after);
+
+void   gtk_signal_connect_object_while_alive (GtkObject	       *object,
 					      const gchar      *signal,
-					      GtkSignalFunc     func,
-					      GtkObject        *alive_object);
-void   gtk_signal_connect_while_alive	     (GtkObject        *object,
+					      GtkSignalFunc	func,
+					      GtkObject	       *alive_object);
+void   gtk_signal_connect_while_alive	     (GtkObject	       *object,
 					      const gchar      *signal,
-					      GtkSignalFunc     func,
-					      gpointer          func_data,
-					      GtkObject        *alive_object);
-
-void   gtk_signal_disconnect              (GtkObject           *object,
-					   gint                 anid);
-void   gtk_signal_disconnect_by_data      (GtkObject           *object,
-					   gpointer             data);
-void   gtk_signal_handler_block           (GtkObject           *object,
-					   gint                 anid);
-void   gtk_signal_handler_block_by_data   (GtkObject           *object,
-					   gpointer             data);
-void   gtk_signal_handler_unblock         (GtkObject           *object,
-					   gint                 anid);
-void   gtk_signal_handler_unblock_by_data (GtkObject           *object,
-					   gpointer             data);
+					      GtkSignalFunc	func,
+					      gpointer		func_data,
+					      GtkObject	       *alive_object);
+
+void   gtk_signal_disconnect		  (GtkObject	       *object,
+					   guint		handler_id);
+void   gtk_signal_disconnect_by_data	  (GtkObject	       *object,
+					   gpointer		data);
+void   gtk_signal_handler_block		  (GtkObject	       *object,
+					   guint		handler_id);
+void   gtk_signal_handler_block_by_data	  (GtkObject	       *object,
+					   gpointer		data);
+void   gtk_signal_handler_unblock	  (GtkObject	       *object,
+					   guint		handler_id);
+void   gtk_signal_handler_unblock_by_data (GtkObject	       *object,
+					   gpointer		data);
 guint  gtk_signal_handler_pending	  (GtkObject	       *object,
-					   gint		        signal_type,
+					   guint		signal_id,
 					   gboolean		may_be_blocked);
-void   gtk_signal_handlers_destroy        (GtkObject           *object);
-void   gtk_signal_default_marshaller      (GtkObject           *object,
-					   GtkSignalFunc        func,
-					   gpointer             func_data,
-					   GtkArg              *args);
-void   gtk_signal_set_funcs               (GtkSignalMarshal     marshal_func,
-					   GtkSignalDestroy     destroy_func);
+void   gtk_signal_handlers_destroy	  (GtkObject	       *object);
+void   gtk_signal_default_marshaller	  (GtkObject	       *object,
+					   GtkSignalFunc	func,
+					   gpointer		func_data,
+					   GtkArg	       *args);
+void   gtk_signal_set_funcs		  (GtkSignalMarshal	marshal_func,
+					   GtkSignalDestroy	destroy_func);
 
 /* Report internal information about a signal. The caller has the response
  *  to invoke a supsequent g_free (returned_data); but must leave the
  *  contents of GtkSignalQuery untouched.
  */
-GtkSignalQuery* gtk_signal_query	  (gint			signal_num);
+GtkSignalQuery* gtk_signal_query	  (guint		signal_id);
 
 
 #ifdef __cplusplus
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index 770b671047..782f5718cd 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -44,7 +44,7 @@ static void gtk_statusbar_update		   (GtkStatusbar      *statusbar,
 						    const gchar       *text);
      
 static GtkContainerClass *parent_class;
-static gint              statusbar_signals[SIGNAL_LAST] = { 0 };
+static guint              statusbar_signals[SIGNAL_LAST] = { 0 };
 
 guint      
 gtk_statusbar_get_type ()
diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c
index 8bb54ab66b..657432af6f 100644
--- a/gtk/gtktipsquery.c
+++ b/gtk/gtktipsquery.c
@@ -81,7 +81,7 @@ static void	gtk_tips_query_widget_entered	(GtkTipsQuery		*tips_query,
 
 /* --- variables --- */
 static GtkLabelClass	*parent_class = NULL;
-static gint		 tips_query_signals[SIGNAL_LAST] = { 0 };
+static guint		 tips_query_signals[SIGNAL_LAST] = { 0 };
 
 
 /* --- functions --- */
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index fa1e3c2adf..c9eb8ad824 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -41,7 +41,7 @@ static void gtk_toggle_button_enter      (GtkButton            *button);
 static void gtk_toggle_button_leave      (GtkButton            *button);
 
 
-static gint toggle_button_signals[LAST_SIGNAL] = { 0 };
+static guint toggle_button_signals[LAST_SIGNAL] = { 0 };
 
 
 guint
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index e850af2adb..e79ab84d64 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -72,7 +72,7 @@ static void gtk_real_toolbar_style_changed       (GtkToolbar      *toolbar,
 
 static GtkContainerClass *parent_class;
 
-static gint toolbar_signals[LAST_SIGNAL] = { 0 };
+static guint toolbar_signals[LAST_SIGNAL] = { 0 };
 
 
 guint
diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index 317a4749ce..d9be758b7c 100644
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -70,7 +70,7 @@ static void gtk_tree_marshal_signal (GtkObject      *object,
 				     GtkArg         *args);
 
 static GtkContainerClass *parent_class = NULL;
-static gint tree_signals[LAST_SIGNAL] = { 0 };
+static guint tree_signals[LAST_SIGNAL] = { 0 };
 
 guint
 gtk_tree_get_type ()
diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index 328d52d141..fcb039f608 100644
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -89,7 +89,7 @@ static void gtk_tree_item_remove_pixmaps (GtkTreeItem       *tree_item);
 
 static GtkItemClass *parent_class = NULL;
 static GtkContainerClass *container_class = NULL;
-static gint tree_item_signals[LAST_SIGNAL] = { 0 };
+static guint tree_item_signals[LAST_SIGNAL] = { 0 };
 
 guint
 gtk_tree_item_get_type ()
diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 2671a1d3a2..eb826cea48 100644
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -83,7 +83,7 @@ typedef void (*GtkArgSetFunc) (GtkObject *object, GtkArg *arg, guint arg_id);
 typedef gint (*GtkFunction) (gpointer data);
 typedef void (*GtkCallbackMarshal) (GtkObject *object,
 				    gpointer data,
-				    int n_args,
+				    guint n_args,
 				    GtkArg *args);
 typedef void (*GtkDestroyNotify) (gpointer data);
 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 02af7b319e..d0d42c148e 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -214,7 +214,7 @@ static GtkWidgetAuxInfo* gtk_widget_aux_info_new     (void);
 static void		 gtk_widget_aux_info_destroy (GtkWidgetAuxInfo *aux_info);
 
 static GtkObjectClass *parent_class = NULL;
-static gint widget_signals[LAST_SIGNAL] = { 0 };
+static guint widget_signals[LAST_SIGNAL] = { 0 };
 
 static GMemChunk *aux_info_mem_chunk = NULL;
 
@@ -2124,7 +2124,7 @@ gtk_widget_grab_focus (GtkWidget *widget)
 {
   GtkWidget *window;
   GtkWidget *child;
-  gint window_type;
+  GtkType window_type;
   
   g_return_if_fail (widget != NULL);
   
@@ -2158,7 +2158,7 @@ void
 gtk_widget_grab_default (GtkWidget *widget)
 {
   GtkWidget *window;
-  gint window_type;
+  GtkType window_type;
   
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_WIDGET_CAN_DEFAULT (widget));
@@ -2823,14 +2823,14 @@ gtk_widget_get_toplevel (GtkWidget *widget)
 
 GtkWidget*
 gtk_widget_get_ancestor (GtkWidget *widget,
-			 gint	    type)
+			 GtkType    widget_type)
 {
   g_return_val_if_fail (widget != NULL, NULL);
   
-  while (widget && !gtk_type_is_a (GTK_WIDGET_TYPE (widget), type))
+  while (widget && !gtk_type_is_a (GTK_WIDGET_TYPE (widget), widget_type))
     widget = widget->parent;
   
-  if (!(widget && gtk_type_is_a (GTK_WIDGET_TYPE (widget), type)))
+  if (!(widget && gtk_type_is_a (GTK_WIDGET_TYPE (widget), widget_type)))
     return NULL;
   
   return widget;
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 657f99b88b..3c805a4d6a 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -234,7 +234,7 @@ struct _GtkWidgetClass
    *  This is used when activating the current focus widget and
    *  the default widget.
    */
-  gint activate_signal;
+  guint activate_signal;
   
   /* basics */
   void (* show)		       (GtkWidget      *widget);
@@ -446,7 +446,7 @@ void	   gtk_widget_set_extension_events (GtkWidget		*widget,
 GdkExtensionMode gtk_widget_get_extension_events (GtkWidget	*widget);
 GtkWidget*   gtk_widget_get_toplevel	(GtkWidget	*widget);
 GtkWidget*   gtk_widget_get_ancestor	(GtkWidget	*widget,
-					 gint		type);
+					 GtkType	widget_type);
 GdkColormap* gtk_widget_get_colormap	(GtkWidget	*widget);
 GdkVisual*   gtk_widget_get_visual	(GtkWidget	*widget);
 gint	     gtk_widget_get_events	(GtkWidget	*widget);
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 28a675d5c7..6b87710d00 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -111,7 +111,7 @@ static gint gtk_window_check_accelerator  (GtkWindow         *window,
 
 
 static GtkBinClass *parent_class = NULL;
-static gint window_signals[LAST_SIGNAL] = { 0 };
+static guint window_signals[LAST_SIGNAL] = { 0 };
 
 
 guint