telepathy-salut: Gibber: stop generating enum types

[Xavier Claessens]

Module: telepathy-salut
Branch: master
Commit: 00c8eb88a2e31c7a8c8083d1b44eb464fa3cf62c
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=00c8eb88a2e31c7a8c8083d1b44eb464fa3cf62c

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Tue Sep 17 14:09:22 2013 -0400

Gibber: stop generating enum types

It breaks build in weird ways and is not useful

---

 lib/gibber/Makefile.am            |   23 -----------------------
 lib/gibber/gibber-file-transfer.c |   10 ++++------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/lib/gibber/Makefile.am b/lib/gibber/Makefile.am
index 3d7bd0b..2b9e33f 100644
--- a/lib/gibber/Makefile.am
+++ b/lib/gibber/Makefile.am
@@ -2,11 +2,6 @@ SUBDIRS = tests
 
 noinst_LTLIBRARIES = libgibber.la
 
-BUILT_SOURCES = \
-  gibber-file-transfer-enumtypes.c \
-  gibber-file-transfer-enumtypes.h \
-  $(NULL)
-
 HANDWRITTEN_SOURCES =             \
   gibber-muc-connection.c         \
   gibber-muc-connection.h         \
@@ -76,24 +71,6 @@ if OS_WINDOWS
   AM_CFLAGS += -D_WIN32_WINNT=0x0501
 endif
 
-# rules for making the glib enum objects
-%-enumtypes.h: %.h Makefile.in
-	$(AM_V_GEN)glib-mkenums \
-	--fhead "#ifndef __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-	--fprod "/* enumerations from \"@filename@\" */\n" \
-	--vhead "GType @enum_name at _get_type (void);\n#define $(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n"         \
-	--ftail "G_END_DECLS\n\n#endif /* __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__ */" \
-	$< > $@
-
-%-enumtypes.c: %.h Makefile.in
-	$(AM_V_GEN)glib-mkenums \
-	--fhead "#include <$*.h>\n#include <$*-enumtypes.h>" \
-	--fprod "\n/* enumerations from \"@filename@\" */" \
-	--vhead "GType\n at enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G at Type@Value values[] = {"     \
-	--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@VALUENAME@\" }," \
-	--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ at type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-	$< > $@
-
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer -:PROJECT telepathy-salut -:STATIC gibber-salut \
 	 -:TAGS eng debug \
diff --git a/lib/gibber/gibber-file-transfer.c b/lib/gibber/gibber-file-transfer.c
index a08e809..c190598 100644
--- a/lib/gibber/gibber-file-transfer.c
+++ b/lib/gibber/gibber-file-transfer.c
@@ -29,8 +29,6 @@
 #define DEBUG_FLAG DEBUG_FILE_TRANSFER
 #include "gibber-debug.h"
 
-#include "gibber-file-transfer-enumtypes.h"
-
 
 G_DEFINE_TYPE(GibberFileTransfer, gibber_file_transfer, G_TYPE_OBJECT)
 
@@ -116,7 +114,7 @@ gibber_file_transfer_get_property (GObject *object,
         g_value_set_string (value, self->filename);
         break;
       case PROP_DIRECTION:
-        g_value_set_enum (value, self->direction);
+        g_value_set_uint (value, self->direction);
         break;
       case PROP_PORTER:
         g_value_set_object (value, self->priv->porter);
@@ -176,7 +174,7 @@ gibber_file_transfer_set_property (GObject *object,
         self->filename = g_value_dup_string (value);
         break;
       case PROP_DIRECTION:
-        self->direction = g_value_get_enum (value);
+        self->direction = g_value_get_uint (value);
         break;
       case PROP_PORTER:
         {
@@ -248,9 +246,9 @@ gibber_file_transfer_class_init (GibberFileTransferClass *gibber_file_transfer_c
       G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
   g_object_class_install_property (object_class, PROP_FILENAME, param_spec);
 
-  param_spec = g_param_spec_enum ("direction",
+  param_spec = g_param_spec_uint ("direction",
       "Direction", "File transfer direction",
-      GIBBER_TYPE_FILE_TRANSFER_DIRECTION,
+      0, G_MAXUINT,
       GIBBER_FILE_TRANSFER_DIRECTION_OUTGOING,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
       G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);