From bf09470d79ca7fd0e5e32a6d1fcd4b88a7c4a79b Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 10 Jul 2002 18:30:23 +0000 Subject: [PATCH] Fix some cases where signal connection IDs where being assigned to guint Wed Jul 10 14:27:14 2002 Owen Taylor * modules/input/gtkimcontextxim.c gtk/gtkcolorsel.c gtk/gtkdialog.c gtk/gtktextbtree.c: Fix some cases where signal connection IDs where being assigned to guint rather than gulong. (part of #87281, Shivram U) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkcolorsel.c | 2 +- gtk/gtkdialog.c | 8 ++++---- gtk/gtktextbtree.c | 2 +- modules/input/gtkimcontextxim.c | 4 ++-- 10 files changed, 50 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c62d15691..d0461c603d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Jul 10 14:27:14 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c gtk/gtkcolorsel.c + gtk/gtkdialog.c gtk/gtktextbtree.c: Fix some cases + where signal connection IDs where being assigned to + guint rather than gulong. (part of #87281, Shivram U) + Fri Jul 5 20:18:23 2002 Owen Taylor * gtk/gtkmenushell.[ch] gtk/gtkmenubar.c gtk/gtkmenuitem.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8c62d15691..d0461c603d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed Jul 10 14:27:14 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c gtk/gtkcolorsel.c + gtk/gtkdialog.c gtk/gtktextbtree.c: Fix some cases + where signal connection IDs where being assigned to + guint rather than gulong. (part of #87281, Shivram U) + Fri Jul 5 20:18:23 2002 Owen Taylor * gtk/gtkmenushell.[ch] gtk/gtkmenubar.c gtk/gtkmenuitem.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8c62d15691..d0461c603d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Wed Jul 10 14:27:14 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c gtk/gtkcolorsel.c + gtk/gtkdialog.c gtk/gtktextbtree.c: Fix some cases + where signal connection IDs where being assigned to + guint rather than gulong. (part of #87281, Shivram U) + Fri Jul 5 20:18:23 2002 Owen Taylor * gtk/gtkmenushell.[ch] gtk/gtkmenubar.c gtk/gtkmenuitem.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8c62d15691..d0461c603d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Wed Jul 10 14:27:14 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c gtk/gtkcolorsel.c + gtk/gtkdialog.c gtk/gtktextbtree.c: Fix some cases + where signal connection IDs where being assigned to + guint rather than gulong. (part of #87281, Shivram U) + Fri Jul 5 20:18:23 2002 Owen Taylor * gtk/gtkmenushell.[ch] gtk/gtkmenubar.c gtk/gtkmenuitem.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8c62d15691..d0461c603d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed Jul 10 14:27:14 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c gtk/gtkcolorsel.c + gtk/gtkdialog.c gtk/gtktextbtree.c: Fix some cases + where signal connection IDs where being assigned to + guint rather than gulong. (part of #87281, Shivram U) + Fri Jul 5 20:18:23 2002 Owen Taylor * gtk/gtkmenushell.[ch] gtk/gtkmenubar.c gtk/gtkmenuitem.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8c62d15691..d0461c603d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed Jul 10 14:27:14 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c gtk/gtkcolorsel.c + gtk/gtkdialog.c gtk/gtktextbtree.c: Fix some cases + where signal connection IDs where being assigned to + guint rather than gulong. (part of #87281, Shivram U) + Fri Jul 5 20:18:23 2002 Owen Taylor * gtk/gtkmenushell.[ch] gtk/gtkmenubar.c gtk/gtkmenuitem.c diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index f913fdce0e..3cd40b51ef 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -137,7 +137,7 @@ struct _ColorSelectionPrivate GtkWidget *dropper_grab_widget; /* Connection to settings */ - guint settings_connection; + gulong settings_connection; }; diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 689b3952a6..d2d5af9538 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -912,10 +912,10 @@ gtk_dialog_run (GtkDialog *dialog) { RunInfo ri = { NULL, GTK_RESPONSE_NONE, NULL }; gboolean was_modal; - guint response_handler; - guint unmap_handler; - guint destroy_handler; - guint delete_handler; + gulong response_handler; + gulong unmap_handler; + gulong destroy_handler; + gulong delete_handler; g_return_val_if_fail (GTK_IS_DIALOG (dialog), -1); diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index 0ebe88b16f..7f270e19a8 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -182,7 +182,7 @@ struct _GtkTextBTree { GtkTextBuffer *buffer; BTreeView *views; GSList *tag_infos; - guint tag_changed_handler; + gulong tag_changed_handler; /* Incremented when a segment with a byte size > 0 * is added to or removed from the tree (i.e. the diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index febc44aa19..d46501af60 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -44,8 +44,8 @@ struct _StatusWindow GtkWidget *toplevel; /* Signal connection ids; we connect to the toplevel */ - guint destroy_handler_id; - guint configure_handler_id; + gulong destroy_handler_id; + gulong configure_handler_id; }; static void gtk_im_context_xim_class_init (GtkIMContextXIMClass *class);