From aaee9100270a2ed2aba3eec8017848a0ba76efb5 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Thu, 26 Oct 2000 00:11:09 +0000 Subject: [PATCH] invoke maketypes.awk with LC_ALL=C to avoid localization misbehaviour. Thu Oct 26 02:10:32 2000 Tim Janik * gtk/Makefile.am: invoke maketypes.awk with LC_ALL=C to avoid localization misbehaviour. * gtk/gtk-boxed.defs: nuked "boxed" type GtkCTreeNode, since it's a useless type without copy/free. * gtk/gtkctree.c (gtk_ctree_class_init): use GTK_TYPE_POINTER instead of GTK_TYPE_CTREE_NODE. --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-0 | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-2 | 11 +++++++++++ ChangeLog.pre-2-4 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ gtk/Makefile.am | 6 +++--- gtk/gtk-boxed.defs | 2 -- gtk/gtkctree.c | 12 ++++++------ 10 files changed, 86 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12c5d51b2d..eaa3b04add 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Thu Oct 26 02:10:32 2000 Tim Janik + + * gtk/Makefile.am: invoke maketypes.awk with LC_ALL=C to avoid + localization misbehaviour. + + * gtk/gtk-boxed.defs: nuked "boxed" type GtkCTreeNode, since it's + a useless type without copy/free. + + * gtk/gtkctree.c (gtk_ctree_class_init): use GTK_TYPE_POINTER instead + of GTK_TYPE_CTREE_NODE. + Thu Oct 26 00:51:52 2000 Tim Janik * gtk/gtksignal.c: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 12c5d51b2d..eaa3b04add 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +Thu Oct 26 02:10:32 2000 Tim Janik + + * gtk/Makefile.am: invoke maketypes.awk with LC_ALL=C to avoid + localization misbehaviour. + + * gtk/gtk-boxed.defs: nuked "boxed" type GtkCTreeNode, since it's + a useless type without copy/free. + + * gtk/gtkctree.c (gtk_ctree_class_init): use GTK_TYPE_POINTER instead + of GTK_TYPE_CTREE_NODE. + Thu Oct 26 00:51:52 2000 Tim Janik * gtk/gtksignal.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 12c5d51b2d..eaa3b04add 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Thu Oct 26 02:10:32 2000 Tim Janik + + * gtk/Makefile.am: invoke maketypes.awk with LC_ALL=C to avoid + localization misbehaviour. + + * gtk/gtk-boxed.defs: nuked "boxed" type GtkCTreeNode, since it's + a useless type without copy/free. + + * gtk/gtkctree.c (gtk_ctree_class_init): use GTK_TYPE_POINTER instead + of GTK_TYPE_CTREE_NODE. + Thu Oct 26 00:51:52 2000 Tim Janik * gtk/gtksignal.c: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 12c5d51b2d..eaa3b04add 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +Thu Oct 26 02:10:32 2000 Tim Janik + + * gtk/Makefile.am: invoke maketypes.awk with LC_ALL=C to avoid + localization misbehaviour. + + * gtk/gtk-boxed.defs: nuked "boxed" type GtkCTreeNode, since it's + a useless type without copy/free. + + * gtk/gtkctree.c (gtk_ctree_class_init): use GTK_TYPE_POINTER instead + of GTK_TYPE_CTREE_NODE. + Thu Oct 26 00:51:52 2000 Tim Janik * gtk/gtksignal.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 12c5d51b2d..eaa3b04add 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Thu Oct 26 02:10:32 2000 Tim Janik + + * gtk/Makefile.am: invoke maketypes.awk with LC_ALL=C to avoid + localization misbehaviour. + + * gtk/gtk-boxed.defs: nuked "boxed" type GtkCTreeNode, since it's + a useless type without copy/free. + + * gtk/gtkctree.c (gtk_ctree_class_init): use GTK_TYPE_POINTER instead + of GTK_TYPE_CTREE_NODE. + Thu Oct 26 00:51:52 2000 Tim Janik * gtk/gtksignal.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 12c5d51b2d..eaa3b04add 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Thu Oct 26 02:10:32 2000 Tim Janik + + * gtk/Makefile.am: invoke maketypes.awk with LC_ALL=C to avoid + localization misbehaviour. + + * gtk/gtk-boxed.defs: nuked "boxed" type GtkCTreeNode, since it's + a useless type without copy/free. + + * gtk/gtkctree.c (gtk_ctree_class_init): use GTK_TYPE_POINTER instead + of GTK_TYPE_CTREE_NODE. + Thu Oct 26 00:51:52 2000 Tim Janik * gtk/gtksignal.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 12c5d51b2d..eaa3b04add 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Thu Oct 26 02:10:32 2000 Tim Janik + + * gtk/Makefile.am: invoke maketypes.awk with LC_ALL=C to avoid + localization misbehaviour. + + * gtk/gtk-boxed.defs: nuked "boxed" type GtkCTreeNode, since it's + a useless type without copy/free. + + * gtk/gtkctree.c (gtk_ctree_class_init): use GTK_TYPE_POINTER instead + of GTK_TYPE_CTREE_NODE. + Thu Oct 26 00:51:52 2000 Tim Janik * gtk/gtksignal.c: diff --git a/gtk/Makefile.am b/gtk/Makefile.am index bb5c735077..6b626ae1d1 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -495,18 +495,18 @@ $(srcdir)/gtkmarshal.c $(srcdir)/stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list g && echo timestamp > stamp-gtkmarshal.h $(srcdir)/stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk stamp-gtk.defs gtktypebuiltins.h cd $(srcdir) \ - && $(AWK) -f maketypes.awk gtk.defs macros > xgen-gtbh \ + && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs macros > xgen-gtbh \ && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h) \ && rm -f xgen-gtbh \ && echo timestamp > $(@F) $(srcdir)/gtktypebuiltins_vars.c: @REBUILD@ maketypes.awk stamp-gtk.defs cd $(srcdir) \ - && $(AWK) -f maketypes.awk gtk.defs variables > xgen-gtbvc \ + && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs variables > xgen-gtbvc \ && cp xgen-gtbvc $(@F) \ && rm -f xgen-gtbvc $(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk stamp-gtk.defs cd $(srcdir) \ - && $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \ + && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \ && cp xgen-gtbic $(@F) \ && rm -f xgen-gtbic $(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl $(gtk_public_h_sources) $(gdk_headers) diff --git a/gtk/gtk-boxed.defs b/gtk/gtk-boxed.defs index 68c636d2b1..32d96e9bcd 100644 --- a/gtk/gtk-boxed.defs +++ b/gtk/gtk-boxed.defs @@ -17,8 +17,6 @@ gtk_selection_data_copy gtk_selection_data_free) -(define-boxed GtkCTreeNode -) ;;; Gdk boxed types diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 9a80d2c76e..a928959c07 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -392,36 +392,36 @@ gtk_ctree_class_init (GtkCTreeClass *klass) GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_select_row), gtk_marshal_VOID__POINTER_INT, - GTK_TYPE_NONE, 2, GTK_TYPE_CTREE_NODE, GTK_TYPE_INT); + GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT); ctree_signals[TREE_UNSELECT_ROW] = gtk_signal_new ("tree_unselect_row", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_unselect_row), gtk_marshal_VOID__POINTER_INT, - GTK_TYPE_NONE, 2, GTK_TYPE_CTREE_NODE, GTK_TYPE_INT); + GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT); ctree_signals[TREE_EXPAND] = gtk_signal_new ("tree_expand", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_expand), gtk_marshal_VOID__POINTER, - GTK_TYPE_NONE, 1, GTK_TYPE_CTREE_NODE); + GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); ctree_signals[TREE_COLLAPSE] = gtk_signal_new ("tree_collapse", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_collapse), gtk_marshal_VOID__POINTER, - GTK_TYPE_NONE, 1, GTK_TYPE_CTREE_NODE); + GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); ctree_signals[TREE_MOVE] = gtk_signal_new ("tree_move", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_move), gtk_marshal_VOID__POINTER_POINTER_POINTER, - GTK_TYPE_NONE, 3, GTK_TYPE_CTREE_NODE, - GTK_TYPE_CTREE_NODE, GTK_TYPE_CTREE_NODE); + GTK_TYPE_NONE, 3, GTK_TYPE_POINTER, + GTK_TYPE_POINTER, GTK_TYPE_POINTER); ctree_signals[CHANGE_FOCUS_ROW_EXPANSION] = gtk_signal_new ("change_focus_row_expansion", GTK_RUN_LAST | GTK_RUN_ACTION,