Merging in Eitan's gtype-ify of the enums and the IndicateListener... objects.

5 files changed, 81 insertions, 10 deletions

diff --git a/.bzrignore b/.bzrignore
index 3548564..2e5dd36 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -55,3 +55,8 @@ tests/indicate-alot
 tests/indicate-and-crash
 tests/listen-and-print
 tests/show-hide-server
+libindicate/indicate-enum-types.c
+libindicate/indicate-enum-types.h
+libindicate/libindicate_la-indicate-enum-types.lo
+libindicate/s-enum-types-c
+libindicate/s-enum-types-h
diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am
index c1900a6..91072f7 100644
--- a/libindicate/Makefile.am
+++ b/libindicate/Makefile.am
@@ -1,3 +1,6 @@
+MARSHAL_PREFIX = indicate_marshal
+MARSHAL_FILE = indicate-marshal
+ENUM_FILE = indicate-enum-types
 
 INCLUDES= \
 	-DG_LOG_DOMAIN=\"libindicate\"
@@ -14,7 +17,9 @@ BUILT_SOURCES = \
 	dbus-listener-server.h \
 	dbus-listener-client.h \
 	listener-marshal.c \
-	listener-marshal.h
+	listener-marshal.h \
+	$(ENUM_FILE).h \
+	$(ENUM_FILE).c
 
 lib_LTLIBRARIES = \
 	libindicate.la
@@ -26,7 +31,8 @@ indicate_headers = \
 	indicator-message.h \
 	listener.h \
 	server.h \
-	interests.h
+	interests.h \
+	$(ENUM_FILE).h
 
 libindicateinclude_HEADERS = \
 	$(indicate_headers)
@@ -37,6 +43,7 @@ libindicate_la_SOURCES = \
 	dbus-indicate-client.h \
 	dbus-listener-server.h \
 	dbus-listener-client.h \
+	indicate-enum-types.c \
 	server.c \
 	listener.c \
 	listener-marshal.c \
@@ -97,6 +104,39 @@ listener-marshal.c: $(srcdir)/listener-marshal.list
 pkgconfig_DATA = indicate.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
+$(ENUM_FILE).h: s-enum-types-h
+	@true
+s-enum-types-h: $(indicate_headers) Makefile
+	( cd $(srcdir) && glib-mkenums \
+			--fhead "#ifndef _INDICATE_ENUM_TYPES_H_\n#define _INDICATE_ENUM_TYPES_H_\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+			--fprod "/* enumerations from \"@filename@\" */\n" \
+			--vhead "GType @enum_name@_get_type(void);\n#define INDICATE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"	\
+			--ftail "G_END_DECLS\n\n#endif /* _INDICATE_ENUM_TYPES_H_ */" \
+		interests.h ) > tmp-$(ENUM_FILE).h \
+	&& (cmp -s tmp-$(ENUM_FILE).h $(ENUM_FILE).h || cp tmp-$(ENUM_FILE).h $(ENUM_FILE).h ) \
+	&& rm -f tmp-$(ENUM_FILE).h	\
+	&& echo timestamp > $(@F)
+
+$(ENUM_FILE).c: s-enum-types-c
+	@true
+s-enum-types-c: $(indicate_headers) Makefile
+	( cd $(srcdir) && glib-mkenums \
+			--fhead "#include <libindicate/interests.h>\n#include <glib-object.h>" \
+			--fprod "\n/* enumerations from \"@filename@\" */" \
+			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" 	\
+			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+		interests.h ) > tmp-$(ENUM_FILE).c \
+	&& (cmp -s tmp-$(ENUM_FILE).c $(ENUM_FILE).c || cp tmp-$(ENUM_FILE).c $(ENUM_FILE).c ) \
+	&& rm -f tmp-$(ENUM_FILE).c \
+	&& echo timestamp > $(@F)
+
+CLEANFILES = \
+	$(ENUM_FILE).c \
+	$(ENUM_FILE).h \
+	s-enum-types-c \
+	s-enum-types-h
+
 if USE_GIR
 
 gobjectintrospection_gir_DATA = \
diff --git a/libindicate/interests.h b/libindicate/interests.h
index 70c52d9..1c6215a 100644
--- a/libindicate/interests.h
+++ b/libindicate/interests.h
@@ -34,8 +34,7 @@ License version 3 and version 2.1 along with this program.  If not, see
 
 G_BEGIN_DECLS
 
-typedef enum _IndicateInterests IndicateInterests;
-enum _IndicateInterests {
+typedef enum {
 	INDICATE_INTEREST_NONE,              /**< We're of no interest */
 	INDICATE_INTEREST_SERVER_DISPLAY,    /**< Displays the server's existance to the user */
 	INDICATE_INTEREST_SERVER_SIGNAL,     /**< Will send signals to the server to be displayed */
@@ -43,7 +42,7 @@ enum _IndicateInterests {
 	INDICATE_INTEREST_INDICATOR_SIGNAL,  /**< Will return signals based on individual indicators being responded to */
 	INDICATE_INTEREST_INDICATOR_COUNT,   /**< Only displays a count of the indicators */
 	INDICATE_INTEREST_LAST               /**< Makes merges and counting easier */
-};
+} IndicateInterests;
 
 G_END_DECLS
 
diff --git a/libindicate/listener.c b/libindicate/listener.c
index 381a5f9..0646e81 100644
--- a/libindicate/listener.c
+++ b/libindicate/listener.c
@@ -154,35 +154,35 @@ indicate_listener_class_init (IndicateListenerClass * class)
 	                                        G_STRUCT_OFFSET (IndicateListenerClass, indicator_added),
 	                                        NULL, NULL,
 	                                        _indicate_listener_marshal_VOID__POINTER_POINTER_STRING,
-	                                        G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_STRING);
+	                                        G_TYPE_NONE, 3, INDICATE_TYPE_LISTENER_SERVER, INDICATE_TYPE_LISTENER_INDICATOR, G_TYPE_STRING);
 	signals[INDICATOR_REMOVED] = g_signal_new(INDICATE_LISTENER_SIGNAL_INDICATOR_REMOVED,
 	                                        G_TYPE_FROM_CLASS (class),
 	                                        G_SIGNAL_RUN_LAST,
 	                                        G_STRUCT_OFFSET (IndicateListenerClass, indicator_removed),
 	                                        NULL, NULL,
 	                                        _indicate_listener_marshal_VOID__POINTER_POINTER_STRING,
-	                                        G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_STRING);
+	                                        G_TYPE_NONE, 3, INDICATE_TYPE_LISTENER_SERVER, INDICATE_TYPE_LISTENER_INDICATOR, G_TYPE_STRING);
 	signals[INDICATOR_MODIFIED] = g_signal_new(INDICATE_LISTENER_SIGNAL_INDICATOR_MODIFIED,
 	                                        G_TYPE_FROM_CLASS (class),
 	                                        G_SIGNAL_RUN_LAST,
 	                                        G_STRUCT_OFFSET (IndicateListenerClass, indicator_modified),
 	                                        NULL, NULL,
 	                                        _indicate_listener_marshal_VOID__POINTER_POINTER_STRING_STRING,
-	                                        G_TYPE_NONE, 4, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING);
+	                                        G_TYPE_NONE, 4, INDICATE_TYPE_LISTENER_SERVER, INDICATE_TYPE_LISTENER_INDICATOR, G_TYPE_STRING, G_TYPE_STRING);
 	signals[SERVER_ADDED] = g_signal_new(INDICATE_LISTENER_SIGNAL_SERVER_ADDED,
 	                                        G_TYPE_FROM_CLASS (class),
 	                                        G_SIGNAL_RUN_LAST,
 	                                        G_STRUCT_OFFSET (IndicateListenerClass, server_added),
 	                                        NULL, NULL,
 	                                        _indicate_listener_marshal_VOID__POINTER_STRING,
-	                                        G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_STRING);
+	                                        G_TYPE_NONE, 2, INDICATE_TYPE_LISTENER_SERVER, G_TYPE_STRING);
 	signals[SERVER_REMOVED] = g_signal_new(INDICATE_LISTENER_SIGNAL_SERVER_REMOVED,
 	                                        G_TYPE_FROM_CLASS (class),
 	                                        G_SIGNAL_RUN_LAST,
 	                                        G_STRUCT_OFFSET (IndicateListenerClass, server_removed),
 	                                        NULL, NULL,
 	                                        _indicate_listener_marshal_VOID__POINTER_STRING,
-	                                        G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_STRING);
+	                                        G_TYPE_NONE, 2, INDICATE_TYPE_LISTENER_SERVER, G_TYPE_STRING);
 
 	dbus_g_object_register_marshaller(_indicate_listener_marshal_VOID__UINT_STRING,
 	                                  G_TYPE_NONE,
@@ -1024,3 +1024,25 @@ indicate_listener_server_check_interest (IndicateListener * listener, IndicateLi
 	return server->interests[interest];
 }
 
+GType
+indicate_listener_server_get_gtype (void)
+{
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    our_type = g_pointer_type_register_static ("IndicateListenerServer");
+
+  return our_type;
+}
+
+GType
+indicate_listener_indicator_get_gtype (void)
+{
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    our_type = g_pointer_type_register_static ("IndicateListenerIndicator");
+
+  return our_type;
+}
+
diff --git a/libindicate/listener.h b/libindicate/listener.h
index 0fdaa9b..5bfd298 100644
--- a/libindicate/listener.h
+++ b/libindicate/listener.h
@@ -59,7 +59,12 @@ G_BEGIN_DECLS
 #define INDICATE_LISTENER_INDICATOR_ID(indicator)    (indicate_listener_indicator_get_id(indicator))
 
 typedef struct _IndicateListenerServer IndicateListenerServer;
+#define INDICATE_TYPE_LISTENER_SERVER (indicate_listener_server_get_gtype ())
+GType                   indicate_listener_server_get_gtype (void) G_GNUC_CONST;
+
 typedef struct _IndicateListenerIndicator IndicateListenerIndicator;
+#define INDICATE_TYPE_LISTENER_INDICATOR (indicate_listener_indicator_get_gtype ())
+GType                   indicate_listener_indicator_get_gtype (void) G_GNUC_CONST;
 
 typedef struct _IndicateListener IndicateListener;
 struct _IndicateListener {