[Galago-commits] r2603 - in trunk/libgalago-gtk: . libgalago-gtk

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-03-16 23:21:44 -0800 (Thu, 16 Mar 2006)
New Revision: 2603

Modified:
   trunk/libgalago-gtk/ChangeLog
   trunk/libgalago-gtk/libgalago-gtk/
   trunk/libgalago-gtk/libgalago-gtk/Makefile.am
   trunk/libgalago-gtk/libgalago-gtk/galago-gtk.h
Log:
Add enum gtype wrappers.


Modified: trunk/libgalago-gtk/ChangeLog
===================================================================
--- trunk/libgalago-gtk/ChangeLog	2006-03-17 06:56:54 UTC (rev 2602)
+++ trunk/libgalago-gtk/ChangeLog	2006-03-17 07:21:44 UTC (rev 2603)
@@ -1,3 +1,9 @@
+Thu Mar 16 23:21:23 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago-gtk/galago-gtk.h:
+	* libgalago-gtk/Makefile.am:
+	  - Add enum gtype wrappers.
+
 Mon Feb 13 00:18:55 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	D debian:


Property changes on: trunk/libgalago-gtk/libgalago-gtk
___________________________________________________________________
Name: svn:ignore
   - .libs
.deps
Makefile
Makefile.in
core
*.la
*.o
*.lo
*.loT
.*.swp
.*.swo
.icons

   + .libs
.deps
Makefile
Makefile.in
core
s-enum-types-[ch]
galago-gtk-enum-types.[ch]
*.la
*.o
*.lo
*.loT
.*.swp
.*.swo
.icons


Modified: trunk/libgalago-gtk/libgalago-gtk/Makefile.am
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/Makefile.am	2006-03-17 06:56:54 UTC (rev 2602)
+++ trunk/libgalago-gtk/libgalago-gtk/Makefile.am	2006-03-17 07:21:44 UTC (rev 2603)
@@ -2,10 +2,11 @@
 
 #MARSHAL_PREFIX=galago_gtk_marshal
 #MARSHAL_FILE=galago-gtk-marshal
+ENUM_FILE = galago-gtk-enum-types
 
 lib_LTLIBRARIES = libgalago-gtk.la
 
-galagoinc_HEADERS = \
+galago_gtk_headers = \
 	galago-gdk-pixbuf.h \
 	galago-gtk.h \
 	galago-gtk-account-combo-box.h \
@@ -29,6 +30,14 @@
 	galago-gtk-tooltips.h \
 	galago-gtk-types.h
 
+galagoinc_HEADERS = \
+	$(galago_gtk_headers) \
+	$(ENUM_FILE).h
+
+BUILT_SOURCES = \
+	$(ENUM_FILE).h \
+	$(ENUM_FILE).c
+
 libgalago_gtk_la_SOURCES = \
 	galago-gdk-pixbuf.c \
 	galago-gtk-account-combo-box.c \
@@ -41,6 +50,7 @@
 	galago-gtk-contact-list.c \
 	galago-gtk-contact-path-bar.c \
 	galago-gtk-entry-completion.c \
+	galago-gtk-enum-types.c \
 	galago-gtk-person-list.c \
 	galago-gtk-presence-icon.c \
 	galago-gtk-presence-label.c \
@@ -74,9 +84,46 @@
 #	|| (rm -f $(MARSHAL_FILE).tmp && exit 1)
 
 
+$(ENUM_FILE).h: s-enum-types-h
+	@true
+s-enum-types-h: $(galago_gtk_headers) Makefile
+	( cd $(srcdir) && glib-mkenums \
+			--fhead "#ifndef _GALAGO_GTK_ENUM_TYPES_H_\n#define _GALAGO_GTK_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 GALAGO_GTK_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n"	\
+			--ftail "G_END_DECLS\n\n#endif /* _GALAGO_GTK_ENUM_TYPES_H_ */" \
+		$(galago_gtk_headers) ) > tmp-$(ENUM_FILE).h \
+	&& sed -i -e 's/GALAGO_GTK_TYPE_GTK/GALAGO_GTK_TYPE/g' 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: $(galago_gtk_headers) Makefile
+	( cd $(srcdir) && glib-mkenums \
+			--fhead "#include <libgalago-gtk/galago-gtk.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@\", \"@valuenick@\" }," \
+			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ at type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+		$(galago_gtk_headers) ) > tmp-$(ENUM_FILE).c \
+	&& sed -i -e 's/GALAGO_GTK_TYPE_GTK/GALAGO_GTK_TYPE/g' 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)
+
 INCLUDES = \
 	-I$(top_srcdir) \
 	$(BINRELOC_CFLAGS) \
 	$(PACKAGE_CFLAGS) \
 	-DPIXMAPDIR=\""$(datadir)/pixmaps/galago/gtk"\" \
 	-DG_LOG_DOMAIN=\"GalagoGtk\"
+
+EXTRA_DIST = $(ENUM_FILE).h
+
+CLEANFILES = \
+	$(ENUM_FILE).c \
+	$(ENUM_FILE).h \
+	s-enum-types-c \
+	s-enum-types-h

Modified: trunk/libgalago-gtk/libgalago-gtk/galago-gtk.h
===================================================================
--- trunk/libgalago-gtk/libgalago-gtk/galago-gtk.h	2006-03-17 06:56:54 UTC (rev 2602)
+++ trunk/libgalago-gtk/libgalago-gtk/galago-gtk.h	2006-03-17 07:21:44 UTC (rev 2603)
@@ -34,6 +34,7 @@
 #include <libgalago-gtk/galago-gtk-contact-list.h>
 #include <libgalago-gtk/galago-gtk-contact-path-bar.h>
 #include <libgalago-gtk/galago-gtk-entry-completion.h>
+#include <libgalago-gtk/galago-gtk-enum-types.h>
 #include <libgalago-gtk/galago-gtk-person-list.h>
 #include <libgalago-gtk/galago-gtk-presence-icon.h>
 #include <libgalago-gtk/galago-gtk-presence-label.h>