gtk+-2.0, gtk+-3.0: Add PrintfFormat to methods of GtkMessageDialog

Based on patch by Robert Ancell.

Fixes bug 654439.

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index c974d8a48a78e3c77949b553891ba81eba3b8a44..0db140053f8268534f96bf12c181bfacbdb148ba 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -2730,11 +2730,14 @@ namespace Gtk {
                [PrintfFormat]
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public MessageDialog (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
+               [PrintfFormat]
                public void format_secondary_markup (string message_format, ...);
+               [PrintfFormat]
                public void format_secondary_text (string message_format, ...);
                public unowned Gtk.Widget get_image ();
                public void set_image (Gtk.Widget image);
                public void set_markup (string str);
+               [PrintfFormat]
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public MessageDialog.with_markup (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
                [NoAccessorMethod]

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 0c94326ab45d74e82c51fe439b3259b3a06254f8..da62541f698010339a7ef1488d0c8616f8851b84 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -2692,12 +2692,15 @@ namespace Gtk {
                [PrintfFormat]
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public MessageDialog (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
+               [PrintfFormat]
                public void format_secondary_markup (string message_format, ...);
+               [PrintfFormat]
                public void format_secondary_text (string message_format, ...);
                public unowned Gtk.Widget get_image ();
                public unowned Gtk.Widget get_message_area ();
                public void set_image (Gtk.Widget image);
                public void set_markup (string str);
+               [PrintfFormat]
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public MessageDialog.with_markup (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
                [NoAccessorMethod]

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 6a0999c471b90bdb38b7ef016dbff38c864a2253..10a239bb13523401f69ee7039de3af77bb993e32 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -346,10 +346,10 @@ gtk_menu_tool_button_new.label nullable="1"
 GtkMessageDialog:buttons accessor_method="0"
 gtk_message_dialog_new ellipsis="1" printf_format="1"
 gtk_message_dialog_new.parent nullable="1"
-gtk_message_dialog_new_with_markup ellipsis="1"
+gtk_message_dialog_new_with_markup ellipsis="1" printf_format="1"
 gtk_message_dialog_new_with_markup.parent nullable="1"
-gtk_message_dialog_format_secondary_markup ellipsis="1"
-gtk_message_dialog_format_secondary_text ellipsis="1"
+gtk_message_dialog_format_secondary_markup ellipsis="1" printf_format="1"
+gtk_message_dialog_format_secondary_text ellipsis="1" printf_format="1"
 gtk_mount_operation_is_showing hidden="1"
 gtk_mount_operation_new.parent nullable="1"
 GtkNotebook.focus_tab hidden="1"

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index dd0cf0cfebb9f685f416d27492ab9db2b671c9dd..7699fb362a86c7cf83b4a317c3b634db092486a3 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -389,10 +389,10 @@ gtk_menu_tool_button_new.label nullable="1"
 GtkMessageDialog:buttons accessor_method="0"
 gtk_message_dialog_new ellipsis="1" printf_format="1"
 gtk_message_dialog_new.parent nullable="1"
-gtk_message_dialog_new_with_markup ellipsis="1"
+gtk_message_dialog_new_with_markup ellipsis="1" printf_format="1"
 gtk_message_dialog_new_with_markup.parent nullable="1"
-gtk_message_dialog_format_secondary_markup ellipsis="1"
-gtk_message_dialog_format_secondary_text ellipsis="1"
+gtk_message_dialog_format_secondary_markup ellipsis="1" printf_format="1"
+gtk_message_dialog_format_secondary_text ellipsis="1" printf_format="1"
 gtk_mount_operation_is_showing hidden="1"
 gtk_mount_operation_new.parent nullable="1"
 GtkNotebook.focus_tab hidden="1"