Import upstream version 0.3.8

7 files changed, 72 insertions, 36 deletions

diff --git a/configure b/configure
index 91ab1ac..ae1b26b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for libindicator 0.3.7.
+# Generated by GNU Autoconf 2.65 for libindicator 0.3.8.
 #
 # Report bugs to <ted@canonical.com>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libindicator'
 PACKAGE_TARNAME='libindicator'
-PACKAGE_VERSION='0.3.7'
-PACKAGE_STRING='libindicator 0.3.7'
+PACKAGE_VERSION='0.3.8'
+PACKAGE_STRING='libindicator 0.3.8'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -1431,7 +1431,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libindicator 0.3.7 to adapt to many kinds of systems.
+\`configure' configures libindicator 0.3.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1501,7 +1501,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libindicator 0.3.7:";;
+     short | recursive ) echo "Configuration of libindicator 0.3.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1609,7 +1609,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libindicator configure 0.3.7
+libindicator configure 0.3.8
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1887,7 +1887,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libindicator $as_me 0.3.7, which was
+It was created by libindicator $as_me 0.3.8, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2700,7 +2700,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=libindicator
- VERSION=0.3.7
+ VERSION=0.3.8
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12170,7 +12170,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libindicator $as_me 0.3.7, which was
+This file was extended by libindicator $as_me 0.3.8, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12236,7 +12236,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libindicator config.status 0.3.7
+libindicator config.status 0.3.8
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index a45a477..8ae0c74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 
-AC_INIT(libindicator, 0.3.7, ted@canonical.com)
+AC_INIT(libindicator, 0.3.8, ted@canonical.com)
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libindicator, 0.3.7)
+AM_INIT_AUTOMAKE(libindicator, 0.3.8)
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
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 ***/