From 58d0d111af5580051b4d9a5cbaef4d7b96fdcfa8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 15 Mar 2010 10:38:59 -0400 Subject: Prevent future bugs like #612792. Add G_GNUC_NULL_TERMINATED to EAlert functions with variable-length parameter lists and drop the unnecessary "arg0" parameter so the function attribute works correctly. --- e-util/e-alert-dialog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'e-util/e-alert-dialog.c') diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c index 9a49a76223..09512ce17c 100644 --- a/e-util/e-alert-dialog.c +++ b/e-util/e-alert-dialog.c @@ -274,14 +274,14 @@ e_alert_dialog_new (GtkWindow *parent, EAlert *alert) } GtkWidget* -e_alert_dialog_new_for_args (GtkWindow *parent, const gchar *tag, const gchar *arg0, ...) +e_alert_dialog_new_for_args (GtkWindow *parent, const gchar *tag, ...) { GtkWidget *d; EAlert *e; va_list ap; - va_start(ap, arg0); - e = e_alert_new_valist(tag, arg0, ap); + va_start(ap, tag); + e = e_alert_new_valist(tag, ap); va_end(ap); d = e_alert_dialog_new (parent, e); @@ -305,14 +305,14 @@ e_alert_run_dialog(GtkWindow *parent, EAlert *alert) } gint -e_alert_run_dialog_for_args (GtkWindow *parent, const gchar *tag, const gchar *arg0, ...) +e_alert_run_dialog_for_args (GtkWindow *parent, const gchar *tag, ...) { EAlert *e; va_list ap; gint response; - va_start(ap, arg0); - e = e_alert_new_valist(tag, arg0, ap); + va_start(ap, tag); + e = e_alert_new_valist(tag, ap); va_end(ap); response = e_alert_run_dialog (parent, e); -- cgit v1.2.3