diff --git a/ChangeLog b/ChangeLog
index 4d8a46d4d..b4fb42129 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-18  Mike Kestner  <mkestner@novell.com>
+
+	* gtk/gtk-api.raw : regen.
+	* parser/gapi2xml.pl : deal with G_GNUC_PRINTF.
+
 2005-01-17  Mike Kestner  <mkestner@novell.com>
 
 	* gtk/Style.custom : add Light, LightColors, Mid, MidColors, Dark,
diff --git a/gtk/gtk-api.raw b/gtk/gtk-api.raw
index e7ed5ec6a..565c96b82 100644
--- a/gtk/gtk-api.raw
+++ b/gtk/gtk-api.raw
@@ -7349,9 +7349,8 @@
           <parameter type="GtkDialogFlags" name="flags"/>
           <parameter type="GtkMessageType" name="type"/>
           <parameter type="GtkButtonsType" name="buttons"/>
-          <parameter type="const-gchar*" name="message_format"/>
-          <parameter ellipsis="true"/>
-          <parameter type="6" name="arg7"/>
+          <parameter type="const-gchar*" name="message_format" printf_format="true"/>
+          <parameter ellipsis="true" printf_format_args="true"/>
         </parameters>
       </constructor>
       <constructor cname="gtk_message_dialog_new_with_markup">
@@ -7360,9 +7359,8 @@
           <parameter type="GtkDialogFlags" name="flags"/>
           <parameter type="GtkMessageType" name="type"/>
           <parameter type="GtkButtonsType" name="buttons"/>
-          <parameter type="const-gchar*" name="message_format"/>
-          <parameter ellipsis="true"/>
-          <parameter type="6" name="arg7"/>
+          <parameter type="const-gchar*" name="message_format" printf_format="true"/>
+          <parameter ellipsis="true" printf_format_args="true"/>
         </parameters>
       </constructor>
       <method name="SetMarkup" cname="gtk_message_dialog_set_markup">
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index ab8468d80..80da9657a 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -581,6 +581,13 @@ sub parseParms
 {
 	my ($el, $mdef, $drop_1st) = @_;
 
+	$fmt_args = 0;
+
+	if ($mdef =~ /G_GNUC_PRINTF.*\((\d+,\s*\d+)\s*\)/) {
+		$fmt_args = $1;
+		$mdef =~ s/\s*G_GNUC_PRINTF.*\)//;
+	}
+
 	if (($mdef =~ /\((.*)\)/) && ($1 ne "void")) {
 		@parms = ();
 		$parm = "";
@@ -606,6 +613,15 @@ sub parseParms
 		if (@parms > 0) {
 			addParamsElem($el, @parms);
 		}
+
+		if ($fmt_args != 0) {
+			$fmt_args =~ /(\d+),\s*(\d+)/;
+			$fmt = $1; $args = $2;
+			($params_el, @junk) = $el->getElementsByTagName ("parameters");
+			(@params) = $params_el->getElementsByTagName ("parameter");
+			$params[$fmt-1]->setAttribute ("printf_format", "true");
+			$params[$args-1]->setAttribute ("printf_format_args", "true");
+		}
 	}
 }