Fix generated names for enum types

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a019ac8..a96944b 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -15,14 +15,14 @@ GSIGNOND_INCLUDE_DIR=$(top_srcdir)/include/gsignond
 gsignond-plugin-enum-types.h: gsignond-enum.h.template $(GSIGNOND_INCLUDE_DIR)/gsignond-plugin-interface.h
        $(GLIB_MKENUMS) --template $(srcdir)/gsignond-enum.h.template \
                     --fhead "#ifndef GSIGNOND_PLUGIN_ENUM_TYPES_H_\n#define GSIGNOND_PLUGIN_ENUM_TYPES_H_\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS" \
-                    --identifier-prefix gsignond \
+                    --identifier-prefix GSignond \
                     --ftail "\nG_END_DECLS\n\n#endif\n" \
                     $(GSIGNOND_INCLUDE_DIR)/gsignond-plugin-interface.h > $@
 
 gsignond-plugin-enum-types.c: gsignond-enum.c.template $(GSIGNOND_INCLUDE_DIR)/gsignond-plugin-interface.h
        $(GLIB_MKENUMS) --template $(srcdir)/gsignond-enum.c.template \
                     --fhead "#include \"gsignond-plugin-enum-types.h\"\n" \
-                    --identifier-prefix gsignond \
+                    --identifier-prefix GSignond \
                     $(GSIGNOND_INCLUDE_DIR)/gsignond-plugin-interface.h > $@
 
 

diff --git a/src/common/gsignond-enum.c.template b/src/common/gsignond-enum.c.template
index 6391b95..d8ce58a 100644 (file)
--- a/src/common/gsignond-enum.c.template
+++ b/src/common/gsignond-enum.c.template
@@ -23,7 +23,7 @@ GType
         };
 
         the_type = g_@type@_register_static (
-                        g_intern_static_string ("GSignond@EnumName@"),
+                        g_intern_static_string ("@EnumName@"),
                         values);
     }
 

diff --git a/src/common/gsignond-plugin-interface.c b/src/common/gsignond-plugin-interface.c
index cd0d9b8..9f56076 100644 (file)
--- a/src/common/gsignond-plugin-interface.c
+++ b/src/common/gsignond-plugin-interface.c
@@ -92,7 +92,7 @@ static void gsignond_plugin_default_init (GSignondPluginInterface *g_class)
     signals[STATUS_CHANGED] = g_signal_new ("status-changed", 
         G_TYPE_FROM_CLASS (g_class),
         G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, G_TYPE_NONE,
-        2, GSIGNOND_TYPE_GSIGNOND_PLUGIN_STATE, G_TYPE_STRING);
+        2, GSIGNOND_TYPE_PLUGIN_STATE, G_TYPE_STRING);
 
     g_object_interface_install_property (g_class, g_param_spec_string ("type",
             "Type", "Plugin type", "none",

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index b67ac11..3c00078 100644 (file)
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -11,14 +11,14 @@ BUILT_SOURCES = \
 gsignond-identity-enum-types.h: $(top_srcdir)/src/common/gsignond-enum.h.template gsignond-identity.h
        $(GLIB_MKENUMS) --template $(top_srcdir)/src/common/gsignond-enum.h.template \
                     --fhead "#ifndef GSIGNOND_IDENTITY_ENUM_TYPES_H_\n#define GSIGNOND_IDENTITY_ENUM_TYPES_H_\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS" \
-                    --identifier-prefix gsignond \
+                    --identifier-prefix GSignond \
                     --ftail "\nG_END_DECLS\n\n#endif\n" \
                     $(srcdir)/gsignond-identity.h > $@
 
 gsignond-identity-enum-types.c: $(top_srcdir)/src/common/gsignond-enum.c.template gsignond-identity.h
        $(GLIB_MKENUMS) --template $(top_srcdir)/src/common/gsignond-enum.c.template \
                     --fhead "#include \"gsignond-identity-enum-types.h\"\n" \
-                    --identifier-prefix gsignond \
+                    --identifier-prefix GSignond \
                     $(srcdir)/gsignond-identity.h > $@
 
 gsignond_includedir = $(includedir)/gsignond

diff --git a/src/daemon/gsignond-identity.h b/src/daemon/gsignond-identity.h
index b356d83..585042f 100644 (file)
--- a/src/daemon/gsignond-identity.h
+++ b/src/daemon/gsignond-identity.h
@@ -48,8 +48,7 @@ typedef enum {
     GSIGNOND_IDENTITY_DATA_UPDATED = 0,
     GSIGNOND_IDENTITY_REMOVED,
     GSIGNOND_IDENTITY_SIGNED_OUT
-} IdentityChangeType;
-typedef IdentityChangeType GSignondIdentityChangeType;
+} GSignondIdentityChangeType;
 
 struct _GSignondIdentity
 {