- Add GTypes for the enums.

- Bump to version 0.4.0.
2006-04-26 06:53:25 +00:00 · 2006-04-26 06:53:25 +00:00 · a42dbbb198
parent 870f6923ab
commit a42dbbb198
5 changed files with 66 additions and 26 deletions
--- a/9
+++ b/9
@ -1,3 +1,12 @@
+Tue Apr 25 23:52:42 PDT 2006  Christian Hammond <chipx86@chipx86.com>
+
+	* libnotify/Makefile.am:
+	* libnotify/notify.h:
+	* NEWS:
+	* configure.ac:
+	  - Add GTypes for the enums.
+	  - Bump to version 0.4.0.
+
 Fri Apr 21 15:35:40 PDT 2006  Christian Hammond <chipx86@chipx86.com>

 	* tools/notify-send.c:
--- a/8
+++ b/8
@ -1,9 +1,13 @@
-version 0.3.3:
+version 0.4.0:
 	* Patch by M.S. to switch notify-send to use GOption instead of popt,
 	  to add -v, --version, -h, and --hint options, and to rename
 	  -T, --type to -c, --category. This also fixes assertions when calling
 	  notify-send "". (Bug #41)
-	* Patch by jensgr to fix some C99 usage. (Bug #44)
+	* Fixed the short flag for --type to be -T in notify-send. (Bug #18)
+	* Fixed the help in notify-send to indicate that --expire-timeout
+	  requires milliseconds, not seconds. (Bug #28)
+	* Fixed some C99 usage. Patch by jensgr. (Bug #44)
+	* Fixed notify-send on PPC.

 version 0.3.2 (23-January-2006):
 	* Added back notify_get_server_info() and notify_get_server_caps().
--- a/configure.ac
+++ b/configure.ac
@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
 dnl ################################################################
 dnl # Initialize autoconf
 dnl ################################################################
-AC_INIT(libnotify, 0.3.2, chipx86@gnupdate.org)
+AC_INIT(libnotify, 0.4.0, chipx86@chipx86.com)
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(config.h.in)
 AC_COPYRIGHT([Copyright 2004-2006 Christian Hammond])
@ -13,8 +13,8 @@ dnl ################################################################
 dnl # Version information
 dnl ################################################################
 LIBGALAGO_MAJOR_VERSION=0
-LIBGALAGO_MINOR_VERSION=3
-LIBGALAGO_MICRO_VERSION=2
+LIBGALAGO_MINOR_VERSION=4
+LIBGALAGO_MICRO_VERSION=0
 LIBGALAGO_DEVEL_VERSION=0

 LIBGALAGO_VERSION=$LIBGALAGO_MAJOR_VERSION.$LIBGALAGO_MINOR_VERSION.$LIBGALAGO_MICRO_VERSION
@ -93,19 +93,6 @@ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)

-gdk_modules="gdk-2.0 gdk-pixbuf-2.0"
-PKG_CHECK_MODULES(GDK, [$gdk_modules], have_gdk=yes,
-[
-	have_gdk=no
-
-	AC_WARN("Some test apps will not be built")
-])
-
-AM_CONDITIONAL(HAVE_GDK, test "x$have_gdk" = "xyes")
-
-AC_SUBST(GDK_CFLAGS)
-AC_SUBST(GDK_LIBS)
-
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)

@ -140,7 +127,6 @@ AC_CONFIG_FILES([
 Doxyfile
 Makefile
 libnotify.pc
-libnotify.spec
 libnotify/Makefile
 tests/Makefile
 tools/Makefile
--- a/libnotify/Makefile.am
+++ b/libnotify/Makefile.am
@ -2,20 +2,32 @@ notifyincdir = $(includedir)/libnotify

 MARSHAL_PREFIX = notify_marshal
 MARSHAL_FILE = notify-marshal
+ENUM_FILE = notify-enum-types

 lib_LTLIBRARIES = libnotify.la

-notifyinc_HEADERS = \
+notify_headers = \
 	notify.h \
 	notification.h

+notifyinc_HEADERS = \
+	$(notify_headers) \
+	$(ENUM_FILE).h
+
 noinst_HEADERS = \
 	notify-marshal.h \
 	internal.h

+BUILT_SOURCES = \
+	$(ENUM_FILE).h \
+	$(ENUM_FILE).c \
+	notify-marshal.c \
+	notify-marshal.h
+
 libnotify_la_SOURCES = \
 	notify.c \
 	notification.c \
+	notify-enum-types.c \
 	notify-marshal.c

 libnotify_la_LIBADD = \
@ -24,10 +36,6 @@ libnotify_la_LIBADD = \
 libnotify_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

-BUILT_SOURCES = \
-	notify-marshal.c \
-	notify-marshal.h
-
 notify-marshal.h: notify-marshal.list
 	$(GLIB_GENMARSHAL) --prefix=$(MARSHAL_PREFIX) notify-marshal.list \
 		--header > notify-marshal.h
@ -36,12 +44,44 @@ notify-marshal.c: notify-marshal.list
 	$(GLIB_GENMARSHAL) --prefix=$(MARSHAL_PREFIX) notify-marshal.list \
 		--body > notify-marshal.c

+$(ENUM_FILE).h: s-enum-types-h
+	@true
+s-enum-types-h: $(notify_headers) Makefile
+	( cd $(srcdir) && glib-mkenums \
+			--fhead "#ifndef _NOTIFY_ENUM_TYPES_H_\n#define _NOTIFY_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 NOTIFY_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"	\
+			--ftail "G_END_DECLS\n\n#endif /* _NOTIFY_ENUM_TYPES_H_ */" \
+		$(notify_headers) ) > 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: $(notify_headers) Makefile
+	( cd $(srcdir) && glib-mkenums \
+			--fhead "#include <libnotify/notify.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" \
+		$(notify_headers) ) > 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)
+
 EXTRA_DIST = \
-	notify-marshal.list
+	notify-marshal.list \
+	$(ENUM_FILE).h

 CLEANFILES = \
 	notify-marshal.c \
-	notify-marshal.h
+	notify-marshal.h \
+	$(ENUM_FILE).c \
+	$(ENUM_FILE).h \
+	s-enum-types-c \
+	s-enum-types-h

 INCLUDES = \
 	-I$(top_srcdir) \
--- a/libnotify/notify.h
+++ b/libnotify/notify.h
@ -25,6 +25,7 @@
 #include <time.h>

 #include <libnotify/notification.h>
+#include <libnotify/notify-enum-types.h>

 /**************************************************************************/
 /** @name libnotify Base API                                              */