summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog18
-rw-r--r--ChangeLog.pre-2-018
-rw-r--r--ChangeLog.pre-2-1018
-rw-r--r--ChangeLog.pre-2-218
-rw-r--r--ChangeLog.pre-2-418
-rw-r--r--ChangeLog.pre-2-618
-rw-r--r--ChangeLog.pre-2-818
-rw-r--r--Makefile.am25
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.in15
-rw-r--r--docs/reference/gtk/gtk-sections.txt24
-rw-r--r--docs/reference/gtk/tmpl/gtkmenubar.sgml8
-rw-r--r--docs/tutorial/Makefile.am3
-rw-r--r--gdk-pixbuf/test-loaders.c34
-rw-r--r--gtk/Makefile.am9
15 files changed, 214 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ee435d6e..a78504b44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Sat Mar 2 14:32:50 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in: Default to --disable-gtk-doc (avoid Jade
+ breakage) and --disable-static (static linking causes
+ problems with Xft changes.)
+
+ * autogen.sh: Add --enable-gtk-doc by default.
+
+ * Makefile.am: Add a 'mydistcheck' rule that passes
+ --enable-gtk-doc to the configure since that is needed
+ for 'make dist'.
+
+ * docs/tutorial/Makefile.am (dist-hook): Don't distribute
+ the PDF file. (Rule doesn't work on my system, plus it's
+ big.)
+
+ * gtk/Makefile.am: 'make dist' fixes.
+
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0ee435d6e..a78504b44 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,21 @@
+Sat Mar 2 14:32:50 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in: Default to --disable-gtk-doc (avoid Jade
+ breakage) and --disable-static (static linking causes
+ problems with Xft changes.)
+
+ * autogen.sh: Add --enable-gtk-doc by default.
+
+ * Makefile.am: Add a 'mydistcheck' rule that passes
+ --enable-gtk-doc to the configure since that is needed
+ for 'make dist'.
+
+ * docs/tutorial/Makefile.am (dist-hook): Don't distribute
+ the PDF file. (Rule doesn't work on my system, plus it's
+ big.)
+
+ * gtk/Makefile.am: 'make dist' fixes.
+
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0ee435d6e..a78504b44 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,21 @@
+Sat Mar 2 14:32:50 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in: Default to --disable-gtk-doc (avoid Jade
+ breakage) and --disable-static (static linking causes
+ problems with Xft changes.)
+
+ * autogen.sh: Add --enable-gtk-doc by default.
+
+ * Makefile.am: Add a 'mydistcheck' rule that passes
+ --enable-gtk-doc to the configure since that is needed
+ for 'make dist'.
+
+ * docs/tutorial/Makefile.am (dist-hook): Don't distribute
+ the PDF file. (Rule doesn't work on my system, plus it's
+ big.)
+
+ * gtk/Makefile.am: 'make dist' fixes.
+
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0ee435d6e..a78504b44 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,21 @@
+Sat Mar 2 14:32:50 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in: Default to --disable-gtk-doc (avoid Jade
+ breakage) and --disable-static (static linking causes
+ problems with Xft changes.)
+
+ * autogen.sh: Add --enable-gtk-doc by default.
+
+ * Makefile.am: Add a 'mydistcheck' rule that passes
+ --enable-gtk-doc to the configure since that is needed
+ for 'make dist'.
+
+ * docs/tutorial/Makefile.am (dist-hook): Don't distribute
+ the PDF file. (Rule doesn't work on my system, plus it's
+ big.)
+
+ * gtk/Makefile.am: 'make dist' fixes.
+
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0ee435d6e..a78504b44 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,21 @@
+Sat Mar 2 14:32:50 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in: Default to --disable-gtk-doc (avoid Jade
+ breakage) and --disable-static (static linking causes
+ problems with Xft changes.)
+
+ * autogen.sh: Add --enable-gtk-doc by default.
+
+ * Makefile.am: Add a 'mydistcheck' rule that passes
+ --enable-gtk-doc to the configure since that is needed
+ for 'make dist'.
+
+ * docs/tutorial/Makefile.am (dist-hook): Don't distribute
+ the PDF file. (Rule doesn't work on my system, plus it's
+ big.)
+
+ * gtk/Makefile.am: 'make dist' fixes.
+
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0ee435d6e..a78504b44 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,21 @@
+Sat Mar 2 14:32:50 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in: Default to --disable-gtk-doc (avoid Jade
+ breakage) and --disable-static (static linking causes
+ problems with Xft changes.)
+
+ * autogen.sh: Add --enable-gtk-doc by default.
+
+ * Makefile.am: Add a 'mydistcheck' rule that passes
+ --enable-gtk-doc to the configure since that is needed
+ for 'make dist'.
+
+ * docs/tutorial/Makefile.am (dist-hook): Don't distribute
+ the PDF file. (Rule doesn't work on my system, plus it's
+ big.)
+
+ * gtk/Makefile.am: 'make dist' fixes.
+
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0ee435d6e..a78504b44 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,21 @@
+Sat Mar 2 14:32:50 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in: Default to --disable-gtk-doc (avoid Jade
+ breakage) and --disable-static (static linking causes
+ problems with Xft changes.)
+
+ * autogen.sh: Add --enable-gtk-doc by default.
+
+ * Makefile.am: Add a 'mydistcheck' rule that passes
+ --enable-gtk-doc to the configure since that is needed
+ for 'make dist'.
+
+ * docs/tutorial/Makefile.am (dist-hook): Don't distribute
+ the PDF file. (Rule doesn't work on my system, plus it's
+ big.)
+
+ * gtk/Makefile.am: 'make dist' fixes.
+
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
diff --git a/Makefile.am b/Makefile.am
index 6024710ec..1abc1d946 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -185,3 +185,28 @@ sanity:
snapshot:
$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
+
+# This is a version of the automake-1.4 distcheck rule modified
+# to pass --enable-gtk-doc to ./configure
+#
+mydistcheck: dist
+ -rm -rf $(distdir)
+ GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+ mkdir $(distdir)/=build
+ mkdir $(distdir)/=inst
+ dc_install_base=`cd $(distdir)/=inst && pwd`; \
+ cd $(distdir)/=build \
+ && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) dist
+ -rm -rf $(distdir)
+ @banner="$(distdir).tar.gz is ready for distribution"; \
+ dashes=`echo "$$banner" | sed s/./=/g`; \
+ echo "$$dashes"; \
+ echo "$$banner"; \
+ echo "$$dashes"
diff --git a/autogen.sh b/autogen.sh
index bdaf6699c..3614e96fc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -105,7 +105,7 @@ autoconf
cd $ORIGDIR
if test -z "$AUTOGEN_SUBDIR_MODE"; then
- $srcdir/configure --enable-maintainer-mode "$@"
+ $srcdir/configure --enable-maintainer-mode --enable-gtk-doc "$@"
echo
echo "Now type 'make' to compile $PROJECT."
diff --git a/configure.in b/configure.in
index 32727570d..90bb9c9d2 100644
--- a/configure.in
+++ b/configure.in
@@ -103,6 +103,7 @@ AM_CONFIG_HEADER(config.h)
dnl Initialize libtool
AC_PROG_CC
+AM_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
@@ -277,7 +278,6 @@ AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
# define a MAINT-like variable REBUILD which is set if Perl
# and awk are found, so autogenerated sources can be rebuilt
-AC_PROG_AWK
AC_CHECK_PROGS(PERL, perl5 perl)
# We would like indent, but don't require it.
@@ -286,8 +286,7 @@ AC_CHECK_PROG(INDENT, indent, indent)
REBUILD=\#
if test "x$enable_rebuilds" = "xyes" && \
test -n "$PERL" && \
- $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
- test -n "$AWK" ; then
+ $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
REBUILD=
fi
AC_SUBST(REBUILD)
@@ -1189,13 +1188,11 @@ fi
AC_CHECK_PROG(DB2HTML, db2html, true, false)
AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
+dnl Make people enable the gtk-doc stuff explicitely.
+AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=no]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-if test x$enable_gtk_doc = xauto ; then
- if test x$GTKDOC = xtrue ; then
- enable_gtk_doc=yes
- else
+if test x$enable_gtk_doc = xyes ; then
+ if test x$GTKDOC != xtrue ; then
enable_gtk_doc=no
fi
fi
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 91d4b63a2..520b31c06 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -2471,6 +2471,10 @@ gtk_text_iter_equal
gtk_text_iter_compare
gtk_text_iter_in_range
gtk_text_iter_order
+<SUBSECTION Standard>
+GTK_TYPE_TEXT_ITER
+<SUBSECTION Private>
+gtk_text_iter_get_type
</SECTION>
<SECTION>
@@ -2517,8 +2521,10 @@ GTK_TYPE_TEXT_TAG
GTK_TEXT_TAG_CLASS
GTK_IS_TEXT_TAG_CLASS
GTK_TEXT_TAG_GET_CLASS
+GTK_TYPE_TEXT_ATTRIBUTES
<SUBSECTION Private>
gtk_text_tag_get_type
+gtk_text_attributes_get_type
</SECTION>
<SECTION>
@@ -2868,8 +2874,12 @@ GTK_TREE_MODEL
GTK_IS_TREE_MODEL
GTK_TYPE_TREE_MODEL
GTK_TREE_MODEL_GET_IFACE
+GTK_TYPE_TREE_ITER
+GTK_TYPE_TREE_PATH
<SUBSECTION Private>
gtk_tree_model_get_type
+gtk_tree_iter_get_type
+gtk_tree_path_get_type
</SECTION>
<SECTION>
@@ -3603,8 +3613,10 @@ GTK_TYPE_WIDGET
GTK_WIDGET_CLASS
GTK_IS_WIDGET_CLASS
GTK_WIDGET_GET_CLASS
+GTK_TYPE_REQUISITION
<SUBSECTION Private>
gtk_widget_get_type
+gtk_requisition_get_type
</SECTION>
<SECTION>
@@ -3793,7 +3805,6 @@ gtk_init_abi_check
gtk_init_check_abi_check
gtk_win32_get_installation_directory
GTKMAIN_C_VAR
-GTKTYPEUTILS_VAR
</SECTION>
@@ -3902,8 +3913,10 @@ GTK_TYPE_STYLE
GTK_STYLE_CLASS
GTK_IS_STYLE_CLASS
GTK_STYLE_GET_CLASS
+GTK_TYPE_BORDER
<SUBSECTION Private>
gtk_style_get_type
+gtk_border_get_type
</SECTION>
<SECTION>
@@ -3991,12 +4004,16 @@ gtk_selection_data_targets_include_text
gtk_selection_remove_all
gtk_selection_data_copy
gtk_selection_data_free
+<SUBSECTION Standard>
+GTK_TYPE_SELECTION_DATA
<SUBSECTION Private>
gtk_selection_clear
gtk_selection_incr_event
gtk_selection_notify
gtk_selection_property_notify
gtk_selection_request
+gtk_selection_data_copy
+gtk_selection_data_get_type
</SECTION>
<SECTION>
@@ -4169,6 +4186,7 @@ gtk_type_enum_find_value
gtk_type_flags_find_value
<SUBSECTION Private>
GTK_TYPE_IDENTIFIER
+gtk_identifier_get_type
</SECTION>
<SECTION>
@@ -4375,7 +4393,11 @@ GTK_IS_ICON_FACTORY
GTK_ICON_FACTORY_CLASS
GTK_ICON_FACTORY_GET_CLASS
GTK_IS_ICON_FACTORY_CLASS
+GTK_TYPE_ICON_SET
+GTK_TYPE_ICON_SOURCE
<SUBSECTION Private>
gtk_icon_factory_get_type
+gtk_icon_set_get_type
+gtk_icon_source_get_type
</SECTION>
diff --git a/docs/reference/gtk/tmpl/gtkmenubar.sgml b/docs/reference/gtk/tmpl/gtkmenubar.sgml
index 3b22a5872..5c8531171 100644
--- a/docs/reference/gtk/tmpl/gtkmenubar.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenubar.sgml
@@ -64,3 +64,11 @@ Adds a new #GtkMenuItem to the GtkMenuBar at the position defined by @position
@position: the position in the item list where the @child is added.
+<!-- ##### SIGNAL GtkMenuBar::cycle-focus ##### -->
+<para>
+
+</para>
+
+@menubar: the object which received the signal.
+@arg1:
+
diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am
index 3954b4b4d..0d4eb1e33 100644
--- a/docs/tutorial/Makefile.am
+++ b/docs/tutorial/Makefile.am
@@ -45,9 +45,8 @@ html:
pdf:
(cd $(srcdir); db2pdf gtk-tut.sgml)
-dist-hook: html pdf
+dist-hook: html
cp -Rp $(srcdir)/html $(distdir)
- cp -p $(srcdir)/gtk-tut.pdf $(distdir)
else
html:
echo "***"
diff --git a/gdk-pixbuf/test-loaders.c b/gdk-pixbuf/test-loaders.c
index 387425796..a8c9d360b 100644
--- a/gdk-pixbuf/test-loaders.c
+++ b/gdk-pixbuf/test-loaders.c
@@ -62,7 +62,10 @@ record_bytes (gpointer mem, gsize bytes)
static gpointer
limited_try_malloc (gsize n_bytes)
{
- return record_bytes (malloc (n_bytes + HEADER_SPACE), n_bytes);
+ gpointer mem = malloc (n_bytes + HEADER_SPACE);
+ //fprintf (stderr, "malloced %p\n", mem);
+
+ return record_bytes (mem, n_bytes);
}
static gpointer
@@ -78,6 +81,9 @@ limited_calloc (gsize n_blocks,
int bytes = n_blocks * n_block_bytes + HEADER_SPACE;
gpointer mem = malloc (bytes);
memset (mem, 0, bytes);
+
+ //fprintf (stderr, "calloced %p\n", mem);
+
return record_bytes (mem, n_blocks * n_block_bytes);
}
@@ -85,10 +91,14 @@ static void
limited_free (gpointer mem)
{
gpointer real = ((char*)mem) - HEADER_SPACE;
+ gint new_allocation;
+
+ // fprintf (stderr, "Freeing %p\n", real);
g_assert (current_allocation >= 0);
- current_allocation -= GPOINTER_TO_INT (*(void**)real);
- g_assert (current_allocation >= 0);
+ new_allocation = current_allocation - GPOINTER_TO_INT (*(void**)real);
+ g_assert (new_allocation >= 0);
+ current_allocation = new_allocation;
free (real);
}
@@ -376,6 +386,7 @@ main (int argc, char **argv)
putenv ("GDK_PIXBUF_MODULEDIR="BUILT_MODULES_DIR);
+ #if 0
TEST (valid_ppm_1, TRUE);
TEST (valid_ppm_2, TRUE);
TEST (valid_ppm_3, FALSE); /* image is valid, but we don't handle maxval > 255 */
@@ -403,17 +414,17 @@ main (int argc, char **argv)
TEST (valid_ico_test, TRUE);
TEST (ico_test_1, FALSE);
- TEST (ico_test_2, FALSE);
+ // TEST (ico_test_2, FALSE);
TEST (valid_jpeg_test, TRUE);
TEST (valid_tiff1_test, TRUE);
TEST (tiff1_test_1, FALSE);
TEST (tiff1_test_2, FALSE);
-#if 0
- TEST (tiff1_test_3, FALSE); /* Segfault in TIFFReadDirectory with libtiff 3.5.5, fixed in 3.5.7 */
#endif
+ TEST (tiff1_test_3, FALSE); /* Segfault in TIFFReadDirectory with libtiff 3.5.5, fixed in 3.5.7 */
+#if 0
TEST (valid_tga_test, TRUE);
TEST (tga_test_1, FALSE);
@@ -436,7 +447,7 @@ main (int argc, char **argv)
TEST_RANDOMLY_MODIFIED (valid_tga_test, FALSE);
TEST_RANDOMLY_MODIFIED (valid_jpeg_test, FALSE);
TEST_RANDOMLY_MODIFIED (valid_ico_test, FALSE);
-
+#endif
/* memory tests */
@@ -455,20 +466,17 @@ main (int argc, char **argv)
returns successfully, even though they have called the error
handler with an 'out of memory' message.
*/
-
max_allocation = PRETEND_MEM_SIZE;
almost_exhaust_memory ();
g_print ("Allocated %dK of %dK, %dK free during tests\n",
current_allocation / 1024, max_allocation / 1024,
(max_allocation - current_allocation) / 1024);
-
-#if 0
- LOWMEMTEST (valid_tiff1_test);
-#endif
+ LOWMEMTEST (valid_tiff1_test);
+#if 0
LOWMEMTEST (valid_gif_test);
LOWMEMTEST (valid_png_test);
LOWMEMTEST (valid_jpeg_test);
-
+#endif
return 0;
}
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0115e06d0..8c52c0f85 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -421,13 +421,11 @@ gtk_built_public_sources = @STRIP_BEGIN@ \
@STRIP_END@
# built sources that don't get installed
gtk_built_sources = @STRIP_BEGIN@ \
- stamp-gtk.defs \
- stamp-gtktypebuiltins.h \
- stamp-gtkmarshalers.h \
gtktypebuiltins.c \
gtkmarshalers.c \
gtkmarshalers.h \
gtkmarshal.c \
+ gtkmarshal.h \
gtk.defs \
${gtk_built_public_sources} \
@STRIP_END@
@@ -466,7 +464,7 @@ $(libgtk_x11_1_3_la_OBJECTS) $(libgtk_linux_fb_1_3_la_OBJECTS) $(libgtk_win32_1_
# versions in the build dir. thus a development setup requires
# srcdir to be writable, passing --disable-rebuilds to
# ../configure will supress all autogeneration rules.
-$(srcdir)/gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources) \
+$(srcdir)/gtk.defs: @REBUILD@ gtk-boxed.defs $(gtk_public_h_sources) Makefile
case @GLIB_MKENUMS@ in \
.*) glib_mkenums=`pwd`/@GLIB_MKENUMS@ ;; \
*) glib_mkenums=@GLIB_MKENUMS@ ;; \
@@ -479,7 +477,7 @@ $(srcdir)/gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources) \
--vtail ")" \
$(gtk_public_h_sources) > xgen-gdef \
&& cat gtk-boxed.defs >> xgen-gdef \
- && gtk.defs || cp xgen-gdef gtk.defs \
+ && cp xgen-gdef gtk.defs \
&& rm -f xgen-gdef
all-local: @REBUILD@ gtk.defs
@@ -611,7 +609,6 @@ files:
done
EXTRA_DIST += @STRIP_BEGIN@ \
- oldest-source-stamp \
line-arrow.xbm \
line-wrap.xbm \
tree_plus.xbm \
View Lorry Controller Status