gtk.m4: When testing to see if glib exists, set LIBS="$GTK_LIBS $LIBS" NOT

gtk.m4:
	When testing to see if glib exists, set
	        LIBS="$GTK_LIBS $LIBS"
	NOT
	        LIBS="$LIBS $GTK_LIBS"
	because order matters - if the user specifies their own $LIBS to
	./configure, these need to be passed in last.

gtk/Makefile.am:
	Fix problems with gtktypebuiltins* getting rebuilt every single
	time 'make' was run.

gtk/gtkcalendar.c:
	Set 'week' variable to 0 to get rid of uninitialized
	variable warning. Better solution is to give it the right value
	somewhere :)

gtk/gtkclist.c:
	When computing optimum column size, don't subtract the borders.(?)

gtk/gtkcolorsel.c:
	Don't read past end of array.

diff --git a/gtk.m4 b/gtk.m4
index 0fcfd9f3c5a5cd46782c59f7ef91923633c15bc9..6cce827ea92d98cdd4639e95b967a1c4b9af1603 100644 (file)
--- a/gtk.m4
+++ b/gtk.m4
@@ -47,7 +47,7 @@ AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run
       ac_save_CFLAGS="$CFLAGS"
       ac_save_LIBS="$LIBS"
       CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$LIBS $GTK_LIBS"
+      LIBS="$GTK_LIBS $LIBS"
 dnl
 dnl Now check if the installed GTK is sufficiently new. (Also sanity
 dnl checks the results of gtk-config to some extent

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2729ee3f06d0c4ddb75ab2e74622d01194d442e8..4940581c8ecc3316eb18428d074a47f1b45581da 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -263,35 +263,35 @@ stamp-d: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
        && echo timestamp > stamp-d
 
 # generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins.h: @REBUILD@ gtk.defs maketypes.awk
+gtktypebuiltins.h: #@REBUILD@ gtk.defs maketypes.awk
        cd $(srcdir) \
        && $(AWK) -f maketypes.awk gtk.defs macros > s-gtb \
        && mv s-gtb gtktypebuiltins.h
 
 # generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins_vars.c: @REBUILD@ gtk.defs maketypes.awk
+$(srcdir)/gtktypebuiltins_vars.c: @REBUILD@ $(srcdir)/gtk.defs $(srcdir)/maketypes.awk
        cd $(srcdir) \
        && $(AWK) -f maketypes.awk gtk.defs variables > s-gtbv \
        && mv s-gtbv gtktypebuiltins_vars.c
 
 # generate type entries for type-id registration
-gtktypebuiltins_ids.c: @REBUILD@ gtk.defs maketypes.awk
+$(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ $(srcdir)/gtk.defs $(srcdir)/maketypes.awk
        cd $(srcdir) \
        && $(AWK) -f maketypes.awk gtk.defs entries > s-gtbi \
        && mv s-gtbi gtktypebuiltins_ids.c 
 
 # generate enum value arrays
-gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs
+$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(srcdir)/makeenums.pl $(srcdir)/gtk.defs
        cd $(srcdir) \
        && $(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) > \
        s-gtbe \
        && mv s-gtbe gtktypebuiltins_evals.c
 
-#gtkmarshal.c gtkmarshal.h: @REBUILD@ stamp-m
-#      @:
+$(srcdir)/gtkmarshal.c $(srcdir)/gtkmarshal.h: @REBUILD@ stamp-m
+       @:
 
-stamp-m: @REBUILD@ gtkmarshal.list genmarshal.pl
-       (cd $(srcdir); srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl \
+stamp-m: @REBUILD@ $(srcdir)/gtkmarshal.list $(srcdir)/genmarshal.pl
+       (srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl \
        && (cmp -s s-gmc gtkmarshal.c || mv s-gmc gtkmarshal.c) && rm -f s-gmc \
        && (cmp -s s-gmh gtkmarshal.h || mv s-gmh gtkmarshal.h) && rm -f s-gmh) \
        && echo timestamp > stamp-m

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 33147b3b89a12927bb95ecfb964946179c6fdf79..cd7ef77350e1bbb146fadbe81455ca3e4daed15d 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -1675,7 +1675,7 @@ gtk_calendar_paint_week_numbers (GtkWidget *widget)
 {
   GtkCalendar *calendar;
   GdkGC *gc;
-  gint row, week, year;
+  gint row, week = 0, year;
   gint x_loc;
   char buffer[3];
   gint y_baseline, day_height;

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 897bc34b9b8457009e1ea0378ca4fbf9351e40c6..99f4e85e9a4e4b6f391c1f94b57d3fceb7e55710 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -1753,8 +1753,11 @@ gtk_clist_optimal_column_width (GtkCList *clist,
     return 0;
 
   if (GTK_CLIST_SHOW_TITLES(clist) && clist->column[column].button)
-    width = (clist->column[column].button->requisition.width -
-            (CELL_SPACING + (2 * COLUMN_INSET)));
+    width = (clist->column[column].button->requisition.width)
+#if 0
+            (CELL_SPACING + (2 * COLUMN_INSET)))
+#endif
+               ;
   else
     width = 0;
 

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index a85cda188d5725ad35038b2b160fbd732896cc17..8db7530bafb7b187efc89bd065dbfaa2815c923d 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -939,7 +939,7 @@ gtk_color_selection_drag_handle (GtkWidget        *widget,
   vals[2] = colors[2] * 0xffff;
   vals[3] = colorsel->use_opacity ? colors[3] * 0xffff : 0xffff;
 
-  g_print ("%x %x\n", vals[0], vals[4]);
+  g_print ("%x %x\n", vals[0], vals[3]);
   g_print ("%g\n", colorsel->values[OPACITY]);
   g_print ("%d\n", colorsel->use_opacity);