[gir-repository] Fix annotations for gconf_client_notify_add()
- From: Owen Taylor <otaylor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gir-repository] Fix annotations for gconf_client_notify_add()
- Date: Fri, 7 May 2010 15:58:56 +0000 (UTC)
commit 37e11ba0e7242354725899aba56c28e1edfbee52
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Thu May 6 17:53:46 2010 -0400
Fix annotations for gconf_client_notify_add()
Since gconf_client_notify_add() weirdly uses GFreeFunc rather
than the identical GDestroyNotify we need to explicit annotate
which parameter is the destroy callback.
See bug 617973 for the same fix inside GConf
https://bugzilla.gnome.org/show_bug.cgi?id=617974
gir/GConf-custom.c | 11 +++++++++++
gir/Makefile.am | 4 +++-
2 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/gir/GConf-custom.c b/gir/GConf-custom.c
new file mode 100644
index 0000000..df75d19
--- /dev/null
+++ b/gir/GConf-custom.c
@@ -0,0 +1,11 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+
+/**
+ * gconf_client_notify_add:
+ * @client:
+ * @namespace_section
+ * @func: (scope notified) (closure user_data) (destroy destroy_notify):
+ * @user_data:
+ * @destroy_notify:
+ * @err:
+ */
diff --git a/gir/Makefile.am b/gir/Makefile.am
index 4ae1e3b..33a1a7c 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -62,8 +62,9 @@ lib_LTLIBRARIES += libgirepo-DBus-custom.la
endif
if BUILD_GCONF
+EXTRA_DIST += $(srcdir)/GConf-custom.c
GCONF_INCLUDEDIR=`pkg-config --variable=includedir gconf-2.0`/gconf/2
-GConf-2.0.gir: $(INTROSPECTION_SCANNER)
+GConf-2.0.gir: $(INTROSPECTION_SCANNER) GConf-custom.c
$(INTROSPECTION_SCANNER) -v --namespace GConf --nsversion=2.0 \
--add-include-path=$(srcdir) --add-include-path=. \
--include=GObject-2.0 \
@@ -71,6 +72,7 @@ GConf-2.0.gir: $(INTROSPECTION_SCANNER)
--libtool="$(LIBTOOL)" \
--output $@ \
--pkg gconf-2.0 \
+ $(srcdir)/GConf-custom.c \
$(GCONF_INCLUDEDIR)/gconf/*.h
BUILT_GIRSOURCES += GConf-2.0.gir
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]