From d5e22de8242c4d1a0cd54c4e6b64ad37f8922bb9 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Thu, 6 May 2010 17:47:09 -0400
Subject: 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.

Scan the C files for annotations so that we pick up this
annotation addition.

https://bugzilla.gnome.org/show_bug.cgi?id=617973
---
 gconf/Makefile.am    |  5 +++--
 gconf/gconf-client.c | 10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 0ee1f07e..b4aca94e 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -126,8 +126,9 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
 INTROSPECTION_COMPILER_ARGS= --includedir=$(srcdir)
 
 if HAVE_INTROSPECTION
-introspection_files = \
-	$(gconfinclude_HEADERS)
+introspection_files =				\
+	$(gconfinclude_HEADERS)			\
+	$(filter %.c,$(libgconf_2_la_SOURCES))
 GConf-2.0.gir: libgconf-2.la Makefile
 GConf_2_0_gir_INCLUDES = GObject-2.0
 GConf_2_0_gir_CFLAGS = \
diff --git a/gconf/gconf-client.c b/gconf/gconf-client.c
index 5886a79d..d22c3267 100644
--- a/gconf/gconf-client.c
+++ b/gconf/gconf-client.c
@@ -740,7 +740,15 @@ gconf_client_remove_dir  (GConfClient* client,
 #endif
 }
 
-
+/**
+ * gconf_client_notify_add:
+ * @client:
+ * @namespace_section
+ * @func: (scope notified) (closure user_data) (destroy destroy_notify):
+ * @user_data:
+ * @destroy_notify:
+ * @err:
+ */
 guint
 gconf_client_notify_add (GConfClient* client,
                          const gchar* namespace_section,
-- 
cgit v1.2.1