From 58df98f92a7118caf88af7269120eaf3e2b88036 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 5 Apr 2000 04:11:10 +0000 Subject: [PATCH] Fix screwy indentation. Wed Apr 5 00:08:36 2000 Owen Taylor * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy indentation. * Makefile.am (EXTRA_DIST): Fix typo. * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk to catch gdkconfig.h * gtk/gtkitemfactory.c: Added FIXME. --- ChangeLog | 12 ++++++++++++ ChangeLog.pre-2-0 | 12 ++++++++++++ ChangeLog.pre-2-10 | 12 ++++++++++++ ChangeLog.pre-2-2 | 12 ++++++++++++ ChangeLog.pre-2-4 | 12 ++++++++++++ ChangeLog.pre-2-6 | 12 ++++++++++++ ChangeLog.pre-2-8 | 12 ++++++++++++ Makefile.am | 2 +- gdk/Makefile.am | 1 + gdk/x11/Makefile.am | 1 + gdk/x11/gdkgc-x11.c | 4 ++-- gtk/gtkitemfactory.c | 1 + 12 files changed, 90 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ca38dc090..ae34dabf0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Wed Apr 5 00:08:36 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy + indentation. + + * Makefile.am (EXTRA_DIST): Fix typo. + + * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk + to catch gdkconfig.h + + * gtk/gtkitemfactory.c: Added FIXME. + 2000-03-30 Jonathan Blandford * gtk/gtkpaned.c (gtk_paned_get_position): oops. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3ca38dc090..ae34dabf0d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,15 @@ +Wed Apr 5 00:08:36 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy + indentation. + + * Makefile.am (EXTRA_DIST): Fix typo. + + * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk + to catch gdkconfig.h + + * gtk/gtkitemfactory.c: Added FIXME. + 2000-03-30 Jonathan Blandford * gtk/gtkpaned.c (gtk_paned_get_position): oops. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3ca38dc090..ae34dabf0d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +Wed Apr 5 00:08:36 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy + indentation. + + * Makefile.am (EXTRA_DIST): Fix typo. + + * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk + to catch gdkconfig.h + + * gtk/gtkitemfactory.c: Added FIXME. + 2000-03-30 Jonathan Blandford * gtk/gtkpaned.c (gtk_paned_get_position): oops. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3ca38dc090..ae34dabf0d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,15 @@ +Wed Apr 5 00:08:36 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy + indentation. + + * Makefile.am (EXTRA_DIST): Fix typo. + + * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk + to catch gdkconfig.h + + * gtk/gtkitemfactory.c: Added FIXME. + 2000-03-30 Jonathan Blandford * gtk/gtkpaned.c (gtk_paned_get_position): oops. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3ca38dc090..ae34dabf0d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,15 @@ +Wed Apr 5 00:08:36 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy + indentation. + + * Makefile.am (EXTRA_DIST): Fix typo. + + * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk + to catch gdkconfig.h + + * gtk/gtkitemfactory.c: Added FIXME. + 2000-03-30 Jonathan Blandford * gtk/gtkpaned.c (gtk_paned_get_position): oops. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3ca38dc090..ae34dabf0d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +Wed Apr 5 00:08:36 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy + indentation. + + * Makefile.am (EXTRA_DIST): Fix typo. + + * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk + to catch gdkconfig.h + + * gtk/gtkitemfactory.c: Added FIXME. + 2000-03-30 Jonathan Blandford * gtk/gtkpaned.c (gtk_paned_get_position): oops. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3ca38dc090..ae34dabf0d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +Wed Apr 5 00:08:36 2000 Owen Taylor + + * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy + indentation. + + * Makefile.am (EXTRA_DIST): Fix typo. + + * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk + to catch gdkconfig.h + + * gtk/gtkitemfactory.c: Added FIXME. + 2000-03-30 Jonathan Blandford * gtk/gtkpaned.c (gtk_paned_get_position): oops. diff --git a/Makefile.am b/Makefile.am index 17e824748a..c27fb1f355 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,7 @@ EXTRA_DIST = \ examples/buttons/buttons.c \ examples/buttons/info.xpm \ examples/calendar/Makefile \ - examples/calendar/gcalendar.c \ + examples/calendar/calendar.c \ examples/clist/Makefile \ examples/clist/clist.c \ examples/entry/Makefile \ diff --git a/gdk/Makefile.am b/gdk/Makefile.am index b91ce20d14..f189da3dfb 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -11,6 +11,7 @@ EXTRA_DIST = \ INCLUDES = @STRIP_BEGIN@ \ -DG_LOG_DOMAIN=\"Gdk\" \ -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ @GTK_LOCALE_FLAGS@ \ diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index afa9db5f02..a201cdb153 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -4,6 +4,7 @@ INCLUDES = @STRIP_BEGIN@ \ -DG_LOG_DOMAIN=\"Gdk\" \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ + -I$(top_builddir)/gdk \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ @GTK_LOCALE_FLAGS@ \ diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c index 10d2d09245..16deedc215 100644 --- a/gdk/x11/gdkgc-x11.c +++ b/gdk/x11/gdkgc-x11.c @@ -75,8 +75,8 @@ _gdk_x11_gc_new (GdkDrawable *drawable, gdk_x11_gc_values_to_xvalues (values, values_mask, &xvalues, &xvalues_mask); data->xgc = XCreateGC (GDK_GC_XDISPLAY (gc), - GDK_DRAWABLE_XID (drawable), - xvalues_mask, &xvalues); + GDK_DRAWABLE_XID (drawable), + xvalues_mask, &xvalues); return gc; } diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index c47ee8d278..82a849e17c 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -953,6 +953,7 @@ gtk_item_factory_parse_path (GtkItemFactory *ifactory, *path = g_strdup (str); + /* FIXME: This does not handle __ correctly !!! */ p = q = *path; while (*p) {