Import upstream version 0.3.8

5 files changed, 60 insertions, 24 deletions

diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am
index 4b11a77..983a6a5 100644
--- a/libindicator/Makefile.am
+++ b/libindicator/Makefile.am
@@ -64,7 +64,7 @@ s-enum-types-c: $(indicator_headers)
 	&& (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c )	\
 	&& rm -f tmp-indicator-object-enum-types.c
 
-EXTRA_DIST += indicator-object-enum-types.h
+EXTRA_DIST += indicator-object-enum-types.h.template indicator-object-enum-types.c.template
 CLEANFILES +=						\
 	indicator-object-enum-types.h			\
 	indicator-object-enum-types.c			\
diff --git a/libindicator/Makefile.in b/libindicator/Makefile.in
index c809045..ebe7648 100644
--- a/libindicator/Makefile.in
+++ b/libindicator/Makefile.in
@@ -270,7 +270,8 @@ CLEANFILES = stamp-marshal indicator-object-enum-types.h \
 	$(BUILT_SOURCES)
 DISTCLEANFILES = $(marshal_h) $(marshal_c)
 EXTRA_DIST = indicator.pc.in $(glib_marshal_list) \
-	indicator-object-enum-types.h $(DBUS_SPECS)
+	indicator-object-enum-types.h.template \
+	indicator-object-enum-types.c.template $(DBUS_SPECS)
 marshal_h = $(glib_marshal_list:.list=.h)
 marshal_c = $(glib_marshal_list:.list=.c)
 libindicatorincludedir = $(includedir)/libindicator-0.3/libindicator
diff --git a/libindicator/indicator-object-enum-types.c.template b/libindicator/indicator-object-enum-types.c.template
new file mode 100644
index 0000000..dd7d595
--- /dev/null
+++ b/libindicator/indicator-object-enum-types.c.template
@@ -0,0 +1,30 @@
+/*** BEGIN file-header ***/
+#include "indicator-object-enum-types.h"
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@filename@" */
+#include "@filename@"
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType
+@enum_name@_get_type (void) {
+  static GType enum_type_id = 0;
+  if (G_UNLIKELY (!enum_type_id))
+    {
+      static const G@Type@Value values[] = {
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+        { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+        { 0, NULL, NULL }
+      };
+      enum_type_id = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
+    }
+  return enum_type_id;
+}
+/*** END value-tail ***/
diff --git a/libindicator/indicator-object-enum-types.h b/libindicator/indicator-object-enum-types.h
deleted file mode 100644
index 39587d1..0000000
--- a/libindicator/indicator-object-enum-types.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-
-#ifndef __INDICATOR_OBJECT_ENUM_TYPES_H__
-#define __INDICATOR_OBJECT_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "indicator-object.h" */
-
-GType indicator_scroll_direction_get_type (void) G_GNUC_CONST;
-#define INDICATOR_OBJECT_TYPE_SCROLL_DIRECTION (indicator_scroll_direction_get_type())
-
-G_END_DECLS
-
-#endif /* !__INDICATOR_OBJECT_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/libindicator/indicator-object-enum-types.h.template b/libindicator/indicator-object-enum-types.h.template
new file mode 100644
index 0000000..07175a0
--- /dev/null
+++ b/libindicator/indicator-object-enum-types.h.template
@@ -0,0 +1,27 @@
+/*** BEGIN file-header ***/
+
+#ifndef __INDICATOR_OBJECT_ENUM_TYPES_H__
+#define __INDICATOR_OBJECT_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif /* !__INDICATOR_OBJECT_ENUM_TYPES_H__ */
+/*** END file-tail ***/
+
+/*** BEGIN value-header ***/
+
+GType @enum_name@_get_type (void) G_GNUC_CONST;
+#define INDICATOR_OBJECT_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
+
+/*** END value-header ***/