Bugfixes to make GtkFormDecoder starts to work.

diff --git a/configure.ac b/configure.ac
index da603b4a206c80335fa7899cb17c67266be8c578..006876c3bdfbd51c5648b6012743bd0b5f8dad8e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,7 @@ AC_CONFIG_FILES([
   Makefile
   src/Makefile
   ui/Makefile
+  ui/test/Makefile
   test/Makefile
   docs/Makefile
   docs/reference/Makefile

diff --git a/ui/Makefile.am b/ui/Makefile.am
index 54a8f2b8da63f887ab5a7e8ba8e8e1a1152e5cbf..785db8e18fad1c2c649ae1b8185686e3d2751289 100644 (file)
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -1,7 +1,13 @@
 if GLADEUI
-SUBDIRS = glade
+GLADEDIR = glade
+else
+GLADEDIR =
 endif
 
+SUBDIRS = . \
+          test \
+          $(GLADEDIR)
+
 AM_CPPFLAGS = $(WARN_CFLAGS) \
               $(DISABLE_DEPRECATED_CFLAGS) \
               $(GTKFORMUI_CFLAGS) \

diff --git a/ui/gtkformdecoder.c b/ui/gtkformdecoder.c
index 9ec781a70ef572c98cc0699a1f0c5f921e3e11ff..f3896a3a1dd4f538f4c12e25f1b45afe1a556e63 100644 (file)
--- a/ui/gtkformdecoder.c
+++ b/ui/gtkformdecoder.c
@@ -27,7 +27,7 @@ enum
 };
 
 static void gtk_form_decoder_class_init (GtkFormDecoderClass *klass);
-static void gtk_form_decoder_init (GtkFormDecoder *date);
+static void gtk_form_decoder_init (GtkFormDecoder *decoder);
 
 static void gtk_form_decoder_size_request (GtkWidget *widget,
                                     GtkRequisition *requisition);
@@ -179,7 +179,7 @@ gtk_form_decoder_size_request (GtkWidget *widget,
 
        guint border_width;
 
-       g_return_if_fail (GTK_IS_DATE_ENTRY (widget));
+       g_return_if_fail (GTK_IS_FORM_DECODER (widget));
        g_return_if_fail (requisition != NULL);
 
        decoder = GTK_FORM_DECODER (widget);
@@ -211,7 +211,7 @@ gtk_form_decoder_size_allocate (GtkWidget *widget,
 
        guint border_width;
 
-       g_return_if_fail (GTK_IS_DATE_ENTRY (widget));
+       g_return_if_fail (GTK_IS_FORM_DECODER (widget));
        g_return_if_fail (allocation != NULL);
 
        decoder = GTK_FORM_DECODER (widget);