From 82cfa9c25f1749dc5ec1528eca103e951d7f587f Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Tue, 30 Jul 2019 15:32:38 +0200
Subject: [PATCH] libgimpwidgets: fix annotations in GimpDialog.

(skip) various variable length functions (va_list functions are not
introspectable anyway, but adding manual annotations shows we've have
been through them).

Also (skip) gimp_dialogs_show_help_button even though it could be
introspected without any problem. Yet it's written that's an
internal-only function, so let's forbid bindings from using it.

Finally fix gimp_dialog_add_button() introspection by properly including
Gtk-3.0 introspected library so that g-ir-* knows the GtkWidget type.
---
 Makefile.am                 |  3 ++-
 libgimpwidgets/gimpdialog.c | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index cb2f06346c..de979769fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -207,7 +207,8 @@ Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_INCLUDES = \
 	Gegl-0.4	\
 	Gio-2.0		\
 	GLib-2.0	\
-	GObject-2.0
+	GObject-2.0	\
+	Gtk-3.0
 
 Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_CFLAGS = \
 	-DGIMP_COMPILATION		\
diff --git a/libgimpwidgets/gimpdialog.c b/libgimpwidgets/gimpdialog.c
index 79be39f987..4b2c02df70 100644
--- a/libgimpwidgets/gimpdialog.c
+++ b/libgimpwidgets/gimpdialog.c
@@ -344,7 +344,7 @@ gimp_dialog_response (GtkDialog *dialog,
 
 
 /**
- * gimp_dialog_new:
+ * gimp_dialog_new: (skip)
  * @title:        The dialog's title which will be set with
  *                gtk_window_set_title().
  * @role:         The dialog's @role which will be set with
@@ -395,7 +395,7 @@ gimp_dialog_new (const gchar    *title,
 }
 
 /**
- * gimp_dialog_new_valist:
+ * gimp_dialog_new_valist: (skip)
  * @title:        The dialog's title which will be set with
  *                gtk_window_set_title().
  * @role:         The dialog's @role which will be set with
@@ -467,7 +467,7 @@ gimp_dialog_new_valist (const gchar    *title,
  * except it ensures there is only one help button and automatically
  * sets the RESPONSE_OK widget as the default response.
  *
- * Return value: the button widget that was added.
+ * Return value: (type Gtk.Widget) (transfer none): the button widget that was added.
  **/
 GtkWidget *
 gimp_dialog_add_button (GimpDialog  *dialog,
@@ -516,7 +516,7 @@ gimp_dialog_add_button (GimpDialog  *dialog,
 }
 
 /**
- * gimp_dialog_add_buttons:
+ * gimp_dialog_add_buttons: (skip)
  * @dialog: The @dialog to add buttons to.
  * @...: button_text-response_id pairs.
  *
@@ -537,7 +537,7 @@ gimp_dialog_add_buttons (GimpDialog *dialog,
 }
 
 /**
- * gimp_dialog_add_buttons_valist:
+ * gimp_dialog_add_buttons_valist: (skip)
  * @dialog: The @dialog to add buttons to.
  * @args:   The buttons as va_list.
  *
@@ -699,7 +699,7 @@ gimp_dialog_set_alternative_button_order_from_array (GimpDialog *dialog,
 }
 
 /**
- * gimp_dialogs_show_help_button:
+ * gimp_dialogs_show_help_button: (skip)
  * @show: whether a help button should be added when creating a GimpDialog
  *
  * This function is for internal use only.