diff options
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 23 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 23 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 23 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 23 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 23 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 23 | ||||
| -rw-r--r-- | config.h.in | 3 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | gdk/gdkevents.c | 25 | ||||
| -rw-r--r-- | gdk/gdkimage.c | 13 | ||||
| -rw-r--r-- | gdk/x11/gdkevents-x11.c | 25 | ||||
| -rw-r--r-- | gdk/x11/gdkimage-x11.c | 13 | ||||
| -rw-r--r-- | gtk/gtkclist.c | 2 | ||||
| -rw-r--r-- | gtk/gtkeditable.c | 2 | ||||
| -rw-r--r-- | gtk/gtkfontsel.c | 8 |
16 files changed, 211 insertions, 43 deletions
@@ -1,3 +1,26 @@ +1999-01-01 Jeff Garzik <jgarzik@pobox.com> + + * configure.in, config.h.in: + Check for features.h. + + * gdk/gdkevents.c (gdk_event_put, gdk_events_queue): + Fixed bug in linked list append logic by replacing hand-coded + logic with a call to g_list_append. Bug found by tml. + + * gdk/gdkimage.c: + 'gcc -ansi -pedantic' on GNU/Linux spews warnings and errors + in sys/ipc.h, including one specific admonishment to use + _SVID_SOURCE or _XOPEN_SOURCE. Manually defined the latter, and + included features.h if present to obtain the necessary + side-effects. + + * gtk/gtkclist.c, gtk/gtkeditable.c: + Eliminates comma-after-final-element warnings. + + * gtk/gtkfontsel.c (gtk_font_selection_init): + Fixed bug where an intl string was declared as _("x") in + local var initializer. + 1998-12-31 Jeff Garzik <jgarzik@pobox.com> * gtk/gtklabel.c (gtk_label_split_text_wrapped): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2c6dfb3e2c..90e5e12afb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,26 @@ +1999-01-01 Jeff Garzik <jgarzik@pobox.com> + + * configure.in, config.h.in: + Check for features.h. + + * gdk/gdkevents.c (gdk_event_put, gdk_events_queue): + Fixed bug in linked list append logic by replacing hand-coded + logic with a call to g_list_append. Bug found by tml. + + * gdk/gdkimage.c: + 'gcc -ansi -pedantic' on GNU/Linux spews warnings and errors + in sys/ipc.h, including one specific admonishment to use + _SVID_SOURCE or _XOPEN_SOURCE. Manually defined the latter, and + included features.h if present to obtain the necessary + side-effects. + + * gtk/gtkclist.c, gtk/gtkeditable.c: + Eliminates comma-after-final-element warnings. + + * gtk/gtkfontsel.c (gtk_font_selection_init): + Fixed bug where an intl string was declared as _("x") in + local var initializer. + 1998-12-31 Jeff Garzik <jgarzik@pobox.com> * gtk/gtklabel.c (gtk_label_split_text_wrapped): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2c6dfb3e2c..90e5e12afb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,26 @@ +1999-01-01 Jeff Garzik <jgarzik@pobox.com> + + * configure.in, config.h.in: + Check for features.h. + + * gdk/gdkevents.c (gdk_event_put, gdk_events_queue): + Fixed bug in linked list append logic by replacing hand-coded + logic with a call to g_list_append. Bug found by tml. + + * gdk/gdkimage.c: + 'gcc -ansi -pedantic' on GNU/Linux spews warnings and errors + in sys/ipc.h, including one specific admonishment to use + _SVID_SOURCE or _XOPEN_SOURCE. Manually defined the latter, and + included features.h if present to obtain the necessary + side-effects. + + * gtk/gtkclist.c, gtk/gtkeditable.c: + Eliminates comma-after-final-element warnings. + + * gtk/gtkfontsel.c (gtk_font_selection_init): + Fixed bug where an intl string was declared as _("x") in + local var initializer. + 1998-12-31 Jeff Garzik <jgarzik@pobox.com> * gtk/gtklabel.c (gtk_label_split_text_wrapped): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2c6dfb3e2c..90e5e12afb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,26 @@ +1999-01-01 Jeff Garzik <jgarzik@pobox.com> + + * configure.in, config.h.in: + Check for features.h. + + * gdk/gdkevents.c (gdk_event_put, gdk_events_queue): + Fixed bug in linked list append logic by replacing hand-coded + logic with a call to g_list_append. Bug found by tml. + + * gdk/gdkimage.c: + 'gcc -ansi -pedantic' on GNU/Linux spews warnings and errors + in sys/ipc.h, including one specific admonishment to use + _SVID_SOURCE or _XOPEN_SOURCE. Manually defined the latter, and + included features.h if present to obtain the necessary + side-effects. + + * gtk/gtkclist.c, gtk/gtkeditable.c: + Eliminates comma-after-final-element warnings. + + * gtk/gtkfontsel.c (gtk_font_selection_init): + Fixed bug where an intl string was declared as _("x") in + local var initializer. + 1998-12-31 Jeff Garzik <jgarzik@pobox.com> * gtk/gtklabel.c (gtk_label_split_text_wrapped): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2c6dfb3e2c..90e5e12afb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,26 @@ +1999-01-01 Jeff Garzik <jgarzik@pobox.com> + + * configure.in, config.h.in: + Check for features.h. + + * gdk/gdkevents.c (gdk_event_put, gdk_events_queue): + Fixed bug in linked list append logic by replacing hand-coded + logic with a call to g_list_append. Bug found by tml. + + * gdk/gdkimage.c: + 'gcc -ansi -pedantic' on GNU/Linux spews warnings and errors + in sys/ipc.h, including one specific admonishment to use + _SVID_SOURCE or _XOPEN_SOURCE. Manually defined the latter, and + included features.h if present to obtain the necessary + side-effects. + + * gtk/gtkclist.c, gtk/gtkeditable.c: + Eliminates comma-after-final-element warnings. + + * gtk/gtkfontsel.c (gtk_font_selection_init): + Fixed bug where an intl string was declared as _("x") in + local var initializer. + 1998-12-31 Jeff Garzik <jgarzik@pobox.com> * gtk/gtklabel.c (gtk_label_split_text_wrapped): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2c6dfb3e2c..90e5e12afb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,26 @@ +1999-01-01 Jeff Garzik <jgarzik@pobox.com> + + * configure.in, config.h.in: + Check for features.h. + + * gdk/gdkevents.c (gdk_event_put, gdk_events_queue): + Fixed bug in linked list append logic by replacing hand-coded + logic with a call to g_list_append. Bug found by tml. + + * gdk/gdkimage.c: + 'gcc -ansi -pedantic' on GNU/Linux spews warnings and errors + in sys/ipc.h, including one specific admonishment to use + _SVID_SOURCE or _XOPEN_SOURCE. Manually defined the latter, and + included features.h if present to obtain the necessary + side-effects. + + * gtk/gtkclist.c, gtk/gtkeditable.c: + Eliminates comma-after-final-element warnings. + + * gtk/gtkfontsel.c (gtk_font_selection_init): + Fixed bug where an intl string was declared as _("x") in + local var initializer. + 1998-12-31 Jeff Garzik <jgarzik@pobox.com> * gtk/gtklabel.c (gtk_label_split_text_wrapped): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2c6dfb3e2c..90e5e12afb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,26 @@ +1999-01-01 Jeff Garzik <jgarzik@pobox.com> + + * configure.in, config.h.in: + Check for features.h. + + * gdk/gdkevents.c (gdk_event_put, gdk_events_queue): + Fixed bug in linked list append logic by replacing hand-coded + logic with a call to g_list_append. Bug found by tml. + + * gdk/gdkimage.c: + 'gcc -ansi -pedantic' on GNU/Linux spews warnings and errors + in sys/ipc.h, including one specific admonishment to use + _SVID_SOURCE or _XOPEN_SOURCE. Manually defined the latter, and + included features.h if present to obtain the necessary + side-effects. + + * gtk/gtkclist.c, gtk/gtkeditable.c: + Eliminates comma-after-final-element warnings. + + * gtk/gtkfontsel.c (gtk_font_selection_init): + Fixed bug where an intl string was declared as _("x") in + local var initializer. + 1998-12-31 Jeff Garzik <jgarzik@pobox.com> * gtk/gtklabel.c (gtk_label_split_text_wrapped): diff --git a/config.h.in b/config.h.in index 600d96c43a..f7d9c6c75a 100644 --- a/config.h.in +++ b/config.h.in @@ -121,6 +121,9 @@ /* Define if you have the <argz.h> header file. */ #undef HAVE_ARGZ_H +/* Define if you have the <features.h> header file. */ +#undef HAVE_FEATURES_H + /* Define if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H diff --git a/configure.in b/configure.in index 2a4c8207f1..0e1765c8f6 100644 --- a/configure.in +++ b/configure.in @@ -315,6 +315,8 @@ AC_SUBST(x_ldflags) AC_SUBST(x_libs) AC_SUBST(xinput_progs) +AC_CHECK_HEADERS(features.h) + if test "x$enable_shm" = "xyes"; then # Check for shared memory AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes) diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 9ea15d52bb..ecffbae84e 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -474,24 +474,17 @@ void gdk_event_put (GdkEvent *event) { GdkEvent *new_event; - GList *tmp_list; g_return_if_fail (event != NULL); new_event = gdk_event_copy (event); - tmp_list = g_list_alloc(); - tmp_list->prev = putback_tail; - tmp_list->next = NULL; - tmp_list->data = new_event; + putback_tail = g_list_append(putback_tail, new_event); if (!putback_events) - { - putback_events = tmp_list; - putback_tail = tmp_list; - } + putback_events = putback_tail; else - putback_tail->next = tmp_list; + putback_tail = putback_tail->next; } /* @@ -1877,18 +1870,12 @@ gdk_events_queue (void) if (gdk_event_translate (event, &xevent)) { - GList *tmp_list = g_list_alloc(); - tmp_list->prev = queued_tail; - tmp_list->next = NULL; - tmp_list->data = event; + queued_tail = g_list_append(queued_tail, event); if (!queued_events) - { - queued_events = tmp_list; - queued_tail = queued_events; - } + queued_events = queued_tail; else - queued_tail->next = tmp_list; + queued_tail = queued_tail->next; } else gdk_event_free (event); diff --git a/gdk/gdkimage.c b/gdk/gdkimage.c index 5d48182d93..81bfb7648f 100644 --- a/gdk/gdkimage.c +++ b/gdk/gdkimage.c @@ -16,7 +16,18 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include "config.h" +#include <config.h> + +/* gcc -ansi -pedantic on GNU/Linux causes warnings and errors + * unless this is defined: + * warning: #warning "Files using this header must be compiled with _SVID_SOURCE or _XOPEN_SOURCE" + */ +#ifndef _XOPEN_SOURCE +# define _XOPEN_SOURCE 1 +#endif +#ifdef HAVE_FEATURES_H +# include <features.h> +#endif #include <stdlib.h> #include <sys/types.h> diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index 9ea15d52bb..ecffbae84e 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -474,24 +474,17 @@ void gdk_event_put (GdkEvent *event) { GdkEvent *new_event; - GList *tmp_list; g_return_if_fail (event != NULL); new_event = gdk_event_copy (event); - tmp_list = g_list_alloc(); - tmp_list->prev = putback_tail; - tmp_list->next = NULL; - tmp_list->data = new_event; + putback_tail = g_list_append(putback_tail, new_event); if (!putback_events) - { - putback_events = tmp_list; - putback_tail = tmp_list; - } + putback_events = putback_tail; else - putback_tail->next = tmp_list; + putback_tail = putback_tail->next; } /* @@ -1877,18 +1870,12 @@ gdk_events_queue (void) if (gdk_event_translate (event, &xevent)) { - GList *tmp_list = g_list_alloc(); - tmp_list->prev = queued_tail; - tmp_list->next = NULL; - tmp_list->data = event; + queued_tail = g_list_append(queued_tail, event); if (!queued_events) - { - queued_events = tmp_list; - queued_tail = queued_events; - } + queued_events = queued_tail; else - queued_tail->next = tmp_list; + queued_tail = queued_tail->next; } else gdk_event_free (event); diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c index 5d48182d93..81bfb7648f 100644 --- a/gdk/x11/gdkimage-x11.c +++ b/gdk/x11/gdkimage-x11.c @@ -16,7 +16,18 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include "config.h" +#include <config.h> + +/* gcc -ansi -pedantic on GNU/Linux causes warnings and errors + * unless this is defined: + * warning: #warning "Files using this header must be compiled with _SVID_SOURCE or _XOPEN_SOURCE" + */ +#ifndef _XOPEN_SOURCE +# define _XOPEN_SOURCE 1 +#endif +#ifdef HAVE_FEATURES_H +# include <features.h> +#endif #include <stdlib.h> #include <sys/types.h> diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 99f4e85e9a..d674d2c398 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -160,7 +160,7 @@ enum { ARG_SELECTION_MODE, ARG_ROW_HEIGHT, ARG_REORDERABLE, - ARG_USE_DRAG_ICONS, + ARG_USE_DRAG_ICONS }; /* GtkCList Methods */ diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c index 5d8248471e..dbd78d6362 100644 --- a/gtk/gtkeditable.c +++ b/gtk/gtkeditable.c @@ -64,7 +64,7 @@ enum { enum { TARGET_STRING, TARGET_TEXT, - TARGET_COMPOUND_TEXT, + TARGET_COMPOUND_TEXT }; static void gtk_editable_class_init (GtkEditableClass *klass); diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index bfe4132d78..baae35da73 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -439,7 +439,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel) GtkWidget *text_box, *frame; GtkWidget *table, *label, *hbox, *hbox2, *clist, *button, *vbox, *alignment; gint i, prop, row; - gchar *titles[] = { _("Font Property"), _("Requested Value"), _("Actual Value") }; + gchar *titles[] = { NULL, NULL, NULL }; gchar buffer[128]; gchar *size; gint size_to_match; @@ -447,6 +447,12 @@ gtk_font_selection_init(GtkFontSelection *fontsel) gchar *property, *text; gboolean inserted; + /* Number of internationalized titles here must match number + of NULL initializers above */ + titles[0] = _("Font Property"); + titles[1] = _("Requested Value"); + titles[2] = _("Actual Value"); + /* Initialize the GtkFontSelection struct. We do this here in case any callbacks are triggered while creating the interface. */ fontsel->font = NULL; |