Some adjustments.

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..65c174b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,48 @@
+*~
+*.rpath
+*.pot
+*.mo
+*.gmo
+*.o
+*.lo
+*.la
+*.bak
+*.stamp
+*.tar.gz
+*.pc
+*.sed
+*.sin
+*.header
+.libs
+.deps
+ABOUT-NLS
+INSTALL
+Makefile
+Makefile.in
+Makefile.in.in
+Makevars
+aclocal.m4
+autom4te.cache/
+config.guess
+config.log
+config.sub
+configure
+depcomp
+gtk-doc.make
+install-sh
+ltmain.sh
+m4/
+missing
+config.h
+config.status
+docs/reference/version.xml
+docs/reference/html/
+docs/reference/xml/
+libtool
+stamp-h1
+tests/masked_entry
+POTFILES
+mkinstalldirs
+stamp-it
+intltool-*
+Rules-quot

diff --git a/ChangeLog b/ChangeLog
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/Makefile.am b/Makefile.am
index 76c193eb47d5aa3d8d99152b66bc895f2fdc1c0e..cee40e7ed0502e457e97cc6b0ffb578403c728d2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,31 @@
+ACLOCAL_AMFLAGS = -I m4
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+
 SUBDIRS = src tests docs glade
 
 EXTRA_DIST = libgtkmaskedentry.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgtkmaskedentry.pc
+
+distclean-local:
+       if test "$(srcdir)" = "."; then :; else \
+               rm -f ChangeLog; \
+       fi
+
+ChangeLog:
+       @echo Creating $@
+       @if test -d "$(srcdir)/.git"; then \
+         (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \
+         && mv -f $@.tmp $@ \
+         || ($(RM) $@.tmp; \
+             echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+             (test -f $@ || echo git-log is required to generate this file >> $@)); \
+       else \
+         test -f $@ || \
+         (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+         echo A git checkout and git-log is required to generate this file >> $@); \
+       fi
+
+.PHONY: ChangeLog

diff --git a/autogen.sh b/autogen.sh
old mode 100644 (file)
new mode 100755 (executable)
index 2804c74..6cf4d7c
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,98 +1,23 @@
-#!/bin/sh
+#!/bin/bash
 # Run this to generate all the initial makefiles, etc.
 
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=libgtkmaskedentry
-TEST_TYPE=-f
-FILE=configure.ac
+PKG_NAME="libgtkmaskedentry"
 
-DIE=0
-
-have_libtool=false
-if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
-       libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
-       case $libtool_version in
-           1.4*|1.5*)
-               have_libtool=true
-               ;;
-       esac
-fi
-if $have_libtool ; then : ; else
-       echo
-       echo "You must have libtool 1.4 installed to compile $PROJECT."
-       echo "Install the appropriate package for your distribution,"
-       echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
-       DIE=1
-fi
-
-(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
-       echo
-       echo "You must have gtk-doc installed to compile $PROJECT."
-       echo "Install the appropriate package for your distribution,"
-       echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-       DIE=1
+(test -f $srcdir/configure.ac \
+  && test -d $srcdir/src \
+  && test -f $srcdir/src/gtkmaskedentry.h) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level libgtkmaskedentry directory"
+    exit 1
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-       echo
-       echo "You must have autoconf installed to compile $PROJECT."
-       echo "Install the appropriate package for your distribution,"
-       echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
-       DIE=1
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from GNOME and make"
+    echo "sure the gnome-autogen.sh script is in your \$PATH."
+    exit 1
 }
 
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake
-    ACLOCAL=aclocal
-else
-       echo
-       echo "You must have automake 1.7.x installed to compile $PROJECT."
-       echo "Install the appropriate package for your distribution,"
-       echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
-       DIE=1
-fi
-
-if test "$DIE" -eq 1; then
-       exit 1
-fi
-
-test $TEST_TYPE $FILE || {
-       echo "You must run this script in the top-level $PROJECT directory"
-       exit 1
-}
-
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
-        if test -z "$*"; then
-                echo "I am going to run ./configure with no arguments - if you wish "
-                echo "to pass any to it, please specify them on the $0 command line."
-        fi
-fi
-
-rm -rf autom4te.cache
-
-# README and INSTALL are required by automake, but may be deleted by clean
-# up rules. to get automake to work, simply touch these here, they will be
-# regenerated from their corresponding *.in files by ./configure anyway.
-touch README INSTALL
-
-$ACLOCAL || exit $?
-
-libtoolize --force || exit $?
-gtkdocize || exit $?
-
-autoheader || exit $?
-
-$AUTOMAKE --add-missing || exit $?
-autoconf || exit $?
-cd $ORIGDIR || exit $?
-
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
-        $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
-
-        echo 
-        echo "Now type 'make' to compile $PROJECT."
-fi
+USE_GNOME2_MACROS=1 . gnome-autogen.sh

diff --git a/config.h.in b/config.h.in
index 0e1824b55d0da10aa5571e6d7bb5388a7acc96ba..8ee95d78503f38a0807c386ecb04f77d905455b2 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -30,6 +30,10 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Name of package */
 #undef PACKAGE
 
@@ -45,6 +49,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 

diff --git a/docs/reference/gtkmaskedentry-decl-list.txt b/docs/reference/gtkmaskedentry-decl-list.txt
new file mode 100644 (file)
index 0000000..2fb0ba1
--- /dev/null
+++ b/docs/reference/gtkmaskedentry-decl-list.txt
@@ -0,0 +1,36 @@
+<SECTION>
+<FILE>gtkmaskedentry</FILE>
+<TITLE>GtkMaskedEntry</TITLE>
+GtkMaskedEntry
+gtk_masked_entry_new
+gtk_masked_entry_new_with_mask
+gtk_masked_entry_set_mask
+gtk_masked_entry_get_mask
+gtk_masked_entry_get_text
+<SUBSECTION Standard>
+GTK_MASKED_ENTRY
+GTK_IS_MASKED_ENTRY
+GTK_TYPE_MASKED_ENTRY
+gtk_masked_entry_get_type
+GTK_MASKED_ENTRY_CLASS
+GTK_IS_MASKED_ENTRY_CLASS
+GTK_MASKED_ENTRY_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>gtkcellrenderermasked</FILE>
+<TITLE>GtkCellRendererMasked</TITLE>
+GtkCellRendererMasked
+gtk_cell_renderer_masked_new
+gtk_cell_renderer_masked_new_with_mask
+gtk_cell_renderer_masked_set_mask
+<SUBSECTION Standard>
+GTK_CELL_RENDERER_MASKED
+GTK_IS_CELL_RENDERER_MASKED
+GTK_TYPE_CELL_RENDERER_MASKED
+gtk_cell_renderer_masked_get_type
+GTK_CELL_RENDERER_MASKED_CLASS
+GTK_IS_CELL_RENDERER_MASKED_CLASS
+GTK_CELL_RENDERER_MASKED_GET_CLASS
+</SECTION>
+

diff --git a/docs/reference/gtkmaskedentry-decl.txt b/docs/reference/gtkmaskedentry-decl.txt
new file mode 100644 (file)
index 0000000..11c8a4f
--- /dev/null
+++ b/docs/reference/gtkmaskedentry-decl.txt
@@ -0,0 +1,138 @@
+<MACRO>
+<NAME>GTK_TYPE_MASKED_ENTRY</NAME>
+#define GTK_TYPE_MASKED_ENTRY                 (gtk_masked_entry_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GTK_MASKED_ENTRY</NAME>
+#define GTK_MASKED_ENTRY(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MASKED_ENTRY, GtkMaskedEntry))
+</MACRO>
+<MACRO>
+<NAME>GTK_MASKED_ENTRY_CLASS</NAME>
+#define GTK_MASKED_ENTRY_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MASKED_ENTRY, GtkMaskedEntry))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_MASKED_ENTRY</NAME>
+#define GTK_IS_MASKED_ENTRY(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MASKED_ENTRY))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_MASKED_ENTRY_CLASS</NAME>
+#define GTK_IS_MASKED_ENTRY_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MASKED_ENTRY))
+</MACRO>
+<MACRO>
+<NAME>GTK_MASKED_ENTRY_GET_CLASS</NAME>
+#define GTK_MASKED_ENTRY_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MASKED_ENTRY, GtkMaskedEntry))
+</MACRO>
+<STRUCT>
+<NAME>GtkMaskedEntry</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkMaskedEntryClass</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkMaskedEntry</NAME>
+struct _GtkMaskedEntry
+{
+       GtkEntry entry;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GtkMaskedEntryClass</NAME>
+struct _GtkMaskedEntryClass
+{
+       GtkEntryClass parent_class;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gtk_masked_entry_get_type</NAME>
+<RETURNS>GType </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_masked_entry_new</NAME>
+<RETURNS>GtkWidget *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_masked_entry_new_with_mask</NAME>
+<RETURNS>GtkWidget *</RETURNS>
+const gchar *mask
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_masked_entry_set_mask</NAME>
+<RETURNS>void </RETURNS>
+GtkMaskedEntry *masked_entry,const gchar *mask
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_masked_entry_get_mask</NAME>
+<RETURNS>G_CONST_RETURN gchar *</RETURNS>
+GtkMaskedEntry *masked_entry
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_masked_entry_get_text</NAME>
+<RETURNS>G_CONST_RETURN gchar *</RETURNS>
+GtkMaskedEntry *masked_entry
+</FUNCTION>
+<MACRO>
+<NAME>GTK_TYPE_CELL_RENDERER_MASKED</NAME>
+#define GTK_TYPE_CELL_RENDERER_MASKED                 (gtk_cell_renderer_masked_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GTK_CELL_RENDERER_MASKED</NAME>
+#define GTK_CELL_RENDERER_MASKED(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_MASKED, GtkCellRendererMasked))
+</MACRO>
+<MACRO>
+<NAME>GTK_CELL_RENDERER_MASKED_CLASS</NAME>
+#define GTK_CELL_RENDERER_MASKED_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_MASKED, GtkCellRendererMasked))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_CELL_RENDERER_MASKED</NAME>
+#define GTK_IS_CELL_RENDERER_MASKED(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_MASKED))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_CELL_RENDERER_MASKED_CLASS</NAME>
+#define GTK_IS_CELL_RENDERER_MASKED_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_MASKED))
+</MACRO>
+<MACRO>
+<NAME>GTK_CELL_RENDERER_MASKED_GET_CLASS</NAME>
+#define GTK_CELL_RENDERER_MASKED_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_MASKED, GtkCellRendererMasked))
+</MACRO>
+<STRUCT>
+<NAME>GtkCellRendererMasked</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkCellRendererMaskedClass</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkCellRendererMasked</NAME>
+struct _GtkCellRendererMasked
+{
+  GtkCellRendererText parent;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GtkCellRendererMaskedClass</NAME>
+struct _GtkCellRendererMaskedClass
+{
+  GtkCellRendererTextClass parent_class;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gtk_cell_renderer_masked_get_type</NAME>
+<RETURNS>GType </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_cell_renderer_masked_new</NAME>
+<RETURNS>GtkCellRenderer *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_cell_renderer_masked_new_with_mask</NAME>
+<RETURNS>GtkCellRenderer *</RETURNS>
+const gchar *mask
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_cell_renderer_masked_set_mask</NAME>
+<RETURNS>void </RETURNS>
+GtkCellRendererMasked *renderer, const gchar *mask
+</FUNCTION>

diff --git a/docs/reference/gtkmaskedentry-undeclared.txt b/docs/reference/gtkmaskedentry-undeclared.txt
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/docs/reference/gtkmaskedentry-unused.txt b/docs/reference/gtkmaskedentry-unused.txt
new file mode 100644 (file)
index 0000000..4fcebfe
--- /dev/null
+++ b/docs/reference/gtkmaskedentry-unused.txt
@@ -0,0 +1,2 @@
+GtkCellRendererMaskedClass
+GtkMaskedEntryClass

diff --git a/docs/reference/gtkmaskedentry.args b/docs/reference/gtkmaskedentry.args
new file mode 100644 (file)
index 0000000..3f5fd46
--- /dev/null
+++ b/docs/reference/gtkmaskedentry.args
@@ -0,0 +1,30 @@
+<ARG>
+<NAME>GtkMaskedEntry::mask</NAME>
+<TYPE>gchar*</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>The mask</NICK>
+<BLURB>The mask.</BLURB>
+<DEFAULT>""</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GtkMaskedEntry::tab-inside</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Tabulation inside the widget</NICK>
+<BLURB>Whether pressing tab moves between mask's parts or outside the widget.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GtkCellRendererMasked::mask</NAME>
+<TYPE>gchar*</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Mask</NICK>
+<BLURB>Mask.</BLURB>
+<DEFAULT>NULL</DEFAULT>
+</ARG>
+

diff --git a/docs/reference/gtkmaskedentry.hierarchy b/docs/reference/gtkmaskedentry.hierarchy
new file mode 100644 (file)
index 0000000..1c316eb
--- /dev/null
+++ b/docs/reference/gtkmaskedentry.hierarchy
@@ -0,0 +1,28 @@
+GObject
+  GInitiallyUnowned
+    GtkObject
+      GtkWidget
+        GtkEntry
+          GtkMaskedEntry
+        GtkContainer
+          GtkMenuShell
+            GtkMenu
+      GtkCellRenderer
+        GtkCellRendererText
+          GtkCellRendererMasked
+  GtkStyle
+  GdkDrawable
+    GdkWindow
+  GdkDragContext
+  GtkTooltip
+  GdkScreen
+  GtkEntryBuffer
+  GdkPixbuf
+  GtkSettings
+GInterface
+  GTypePlugin
+  AtkImplementorIface
+  GtkBuildable
+  GtkEditable
+  GtkCellEditable
+  GIcon

diff --git a/docs/reference/gtkmaskedentry.interfaces b/docs/reference/gtkmaskedentry.interfaces
new file mode 100644 (file)
index 0000000..2cfe9a3
--- /dev/null
+++ b/docs/reference/gtkmaskedentry.interfaces
@@ -0,0 +1,6 @@
+GtkWidget AtkImplementorIface GtkBuildable
+GtkEntry GtkCellEditable AtkImplementorIface GtkBuildable GtkEditable
+GtkMaskedEntry GtkCellEditable AtkImplementorIface GtkBuildable GtkEditable
+GtkContainer AtkImplementorIface GtkBuildable
+GtkMenuShell AtkImplementorIface GtkBuildable
+GtkMenu AtkImplementorIface GtkBuildable

diff --git a/docs/reference/gtkmaskedentry.prerequisites b/docs/reference/gtkmaskedentry.prerequisites
new file mode 100644 (file)
index 0000000..5c1f531
--- /dev/null
+++ b/docs/reference/gtkmaskedentry.prerequisites
@@ -0,0 +1,2 @@
+GtkCellEditable GtkWidget
+GIcon GObject

diff --git a/docs/reference/gtkmaskedentry.signals b/docs/reference/gtkmaskedentry.signals
new file mode 100644 (file)
index 0000000..e69de29