From 9ddfc7ec17b25b1b02f30639e291b80be85b9a5f Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sat, 7 Jun 2008 17:23:13 +0000 Subject: [PATCH] Add -Wformat and and fix some compile warnings with gcc 4.3. Fixes bug #537129 (Cosimo Cecchi). svn path=/trunk/; revision=1152 --- libempathy-gtk/empathy-ui-utils.c | 2 +- m4/acinclude.m4 | 4 ++-- src/empathy-status-icon.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index bc4d7597..6b02b1a9 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -1325,7 +1325,7 @@ empathy_url_show (const char *url) GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Unable to open URI")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - error->message); + "%s", error->message); g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 3120d862..18cf7c86 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -29,9 +29,9 @@ AC_DEFUN([IDT_COMPILE_WARNINGS],[ warning_flags="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations" ;; maximum|error) - warning_flags="-Wall -Wunused -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith" + warning_flags="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wchar-subscripts -Wnested-externs -Wpointer-arith" CFLAGS="$warning_flags $CFLAGS" - for option in -Wno-sign-compare -Wno-pointer-sign; do + for option in -Wno-sign-compare -Wno-pointer-sign -Wformat; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" AC_MSG_CHECKING([whether gcc understands $option]) diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index 15695d8f..3c2e7a67 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -554,7 +554,8 @@ status_icon_tube_process (EmpathyStatusIcon *icon, dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, str); + GTK_BUTTONS_OK, + "%s", str); gtk_window_set_title (GTK_WINDOW (dialog), _("Invitation Error")); g_free (str); -- 2.39.2