2006-11-15 Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
authorMichael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
Wed, 15 Nov 2006 13:04:40 +0000 (13:04 +0000)
committerMichael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
Wed, 15 Nov 2006 13:04:40 +0000 (13:04 +0000)
* src/Makefile.am:
* src/hildon-marshalers.c:
* src/hildon-marshalers.h: Fixing the marshalers rebuilding etc.

ChangeLog
src/Makefile.am
src/hildon-marshalers.c [deleted file]
src/hildon-marshalers.h [deleted file]

index f22f787..18629cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-11-15  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
+       * src/Makefile.am:
+       * src/hildon-marshalers.c:
+       * src/hildon-marshalers.h: Fixing the marshalers rebuilding etc.
+
+2006-11-15  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
        * ./: Making the source buildable again, fixing the mkenums thingy.
 
 2006-11-14  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com>
index 6a77cb8..fd92e28 100644 (file)
@@ -3,7 +3,9 @@ INCLUDES                                                = -DG_LOG_DOMAIN=\"hildon-widgets\" \
 
 MAINTAINERCLEANFILES                                   = Makefile.in                   \
                                                          hildon-enum-types.c   \
-                                                         hildon-enum-types.h 
+                                                         hildon-enum-types.h   \
+                                                         hildon-marshalers.h   \
+                                                         hildon-marshalers.c
 
 EXTRA_DIST                                             = hildon-marshalers.list
 
@@ -57,7 +59,8 @@ libhildonwidgets_la_SOURCES                           = hildon-composite-widget.c \
                                                          hildon-color-chooser.c \
                                                          hildon-color-chooser-dialog.c \
                                                          hildon-color-chooser-button.c \
-                                                         hildon-enum-types.c
+                                                         hildon-enum-types.c \
+                                                         hildon-marshalers.c
 
 libhildonwidgets_includedir                            = $(includedir)/hildon-widgets
 
@@ -97,13 +100,13 @@ libhildonwidgets_include_HEADERS                   = hildon-controlbar.h \
                                                          hildon-color-chooser.h \
                                                          hildon-color-chooser-dialog.h \
                                                          hildon-color-chooser-button.h \
-                                                         hildon-enum-types.h
-
+                                                         hildon-enum-types.h \
+                                                         hildon-marshalers.h
 
 # Don't build the library until we have built the header that it needs:
-$(OBJECTS) $(libhildonwidgets_la_OBJECTS): hildon-enum-types.h
+$(OBJECTS) $(libhildonwidgets_la_OBJECTS):               hildon-enum-types.h
 
-hildon-enum-types.h: @REBUILD@ $(libhildonwidgets_include_HEADERS) Makefile
+hildon-enum-types.h:                                     @REBUILD@ $(libhildonwidgets_include_HEADERS) Makefile
        (cd $(srcdir) && glib-mkenums \
                        --fhead "#ifndef __HILDON_ENUM_TYPES_H__\n"     \
                        --fhead "#define __HILDON_ENUM_TYPES_H__\n"     \
@@ -117,7 +120,7 @@ hildon-enum-types.h: @REBUILD@ $(libhildonwidgets_include_HEADERS) Makefile
                        --ftail "\nG_END_DECLS\n\n#endif /* __HILDON_ENUM_TYPES_H__ */" \
                $(libhildonwidgets_include_HEADERS)) > $@
 
-hildon-enum-types.c: @REBUILD@ $(libhildonwidgets_include_HEADERS) Makefile
+hildon-enum-types.c:                                     @REBUILD@ $(libhildonwidgets_include_HEADERS) Makefile
        (cd $(srcdir) && glib-mkenums \
                        --fhead "#include \"hildon-widgets.h\"\n" \
                        --fhead "#include <glib-object.h>" \
@@ -127,24 +130,10 @@ hildon-enum-types.c: @REBUILD@ $(libhildonwidgets_include_HEADERS) Makefile
                        --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
                $(libhildonwidgets_include_HEADERS)) > $@
 
-#hildon-marshalers.h: hildon-marshalers.list
-#      glib-genmarshal --prefix _hildon_marshal --header \
-#                      hildon-marshalers.list >hildon-marshalers.h
-#
-#hildon-marshalers.c: hildon-marshalers.list hildon-marshalers.h
-#      echo '#include <hildon-widgets/hildon-marshalers.h>' >hildon-marshalers.c
-#      glib-genmarshal --prefix _hildon_marshal --body \
-#                      hildon-marshalers.list >>hildon-marshalers.c
-
+hildon-marshalers.h:                                   hildon-marshalers.list
+       glib-genmarshal --prefix _hildon_marshal --header hildon-marshalers.list >hildon-marshalers.h
 
-# Generate the enums source code, with glib-mkenums:
-# This is based on the same Makefile.am stuff in pango:
-# hildonlibs_built_headers = hildon-libs-enum-types.h
-# hildonlibs_built_cfiles = hildon-libs-enum-types.c
-#      hildon-marshalers.c 
-#      hildon-marshalers.h 
-       
+hildon-marshalers.c:                                   hildon-marshalers.list hildon-marshalers.h
+       echo '#include "hildon-marshalers.h"' >hildon-marshalers.c
+       glib-genmarshal --prefix _hildon_marshal --body hildon-marshalers.list >>hildon-marshalers.c
 
diff --git a/src/hildon-marshalers.c b/src/hildon-marshalers.c
deleted file mode 100644 (file)
index b5dd899..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-#include <hildon-widgets/hildon-marshalers.h>
-
-#include       <glib-object.h>
-
-
-#ifdef G_ENABLE_DEBUG
-#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
-#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
-#define g_marshal_value_peek_int(v)      g_value_get_int (v)
-#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
-#define g_marshal_value_peek_long(v)     g_value_get_long (v)
-#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
-#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
-#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
-#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
-#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
-#define g_marshal_value_peek_float(v)    g_value_get_float (v)
-#define g_marshal_value_peek_double(v)   g_value_get_double (v)
-#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
-#define g_marshal_value_peek_param(v)    g_value_get_param (v)
-#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
-#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
-#define g_marshal_value_peek_object(v)   g_value_get_object (v)
-#else /* !G_ENABLE_DEBUG */
-/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
- *          Do not access GValues directly in your code. Instead, use the
- *          g_value_get_*() functions
- */
-#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
-#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
-#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
-#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
-#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
-#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
-#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
-#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
-#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
-#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
-#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
-#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
-#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
-#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
-#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
-#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
-#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
-#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
-#endif /* !G_ENABLE_DEBUG */
-
-
-/* BOOLEAN:ENUM (hildon-marshalers.list:26) */
-void
-_hildon_marshal_BOOLEAN__ENUM (GClosure     *closure,
-                               GValue       *return_value,
-                               guint         n_param_values,
-                               const GValue *param_values,
-                               gpointer      invocation_hint,
-                               gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__ENUM) (gpointer     data1,
-                                                  gint         arg_1,
-                                                  gpointer     data2);
-  register GMarshalFunc_BOOLEAN__ENUM callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 2);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__ENUM) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_enum (param_values + 1),
-                       data2);
-
-  g_value_set_boolean (return_value, v_return);
-}
-
-/* BOOLEAN:INT,INT,INT (hildon-marshalers.list:27) */
-void
-_hildon_marshal_BOOLEAN__INT_INT_INT (GClosure     *closure,
-                                      GValue       *return_value,
-                                      guint         n_param_values,
-                                      const GValue *param_values,
-                                      gpointer      invocation_hint,
-                                      gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__INT_INT_INT) (gpointer     data1,
-                                                         gint         arg_1,
-                                                         gint         arg_2,
-                                                         gint         arg_3,
-                                                         gpointer     data2);
-  register GMarshalFunc_BOOLEAN__INT_INT_INT callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 4);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__INT_INT_INT) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_int (param_values + 1),
-                       g_marshal_value_peek_int (param_values + 2),
-                       g_marshal_value_peek_int (param_values + 3),
-                       data2);
-
-  g_value_set_boolean (return_value, v_return);
-}
-
-/* VOID:OBJECT (hildon-marshalers.list:28) */
-
diff --git a/src/hildon-marshalers.h b/src/hildon-marshalers.h
deleted file mode 100644 (file)
index f616e9d..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#ifndef ___HILDON_MARSHALERS_H__
-#define ___HILDON_MARSHALERS_H__
-
-#include       <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* BOOLEAN:ENUM (hildon-marshalers.list:26) */
-extern void _hildon_marshal_BOOLEAN__ENUM (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-
-/* BOOLEAN:INT,INT,INT (hildon-marshalers.list:27) */
-extern void _hildon_marshal_BOOLEAN__INT_INT_INT (GClosure     *closure,
-                                                  GValue       *return_value,
-                                                  guint         n_param_values,
-                                                  const GValue *param_values,
-                                                  gpointer      invocation_hint,
-                                                  gpointer      marshal_data);
-
-/* VOID:OBJECT (hildon-marshalers.list:28) */
-#define _hildon_marshal_VOID__OBJECT   g_cclosure_marshal_VOID__OBJECT
-
-G_END_DECLS
-
-#endif /* __HILDON_MARSHALERS_H__ */
-