empathy r1152 - in trunk: libempathy-gtk m4 src

[xclaesse svn gnome org]

Author: xclaesse
Date: Sat Jun  7 17:23:13 2008
New Revision: 1152
URL: http://svn.gnome.org/viewvc/empathy?rev=1152&view=rev

Log:
Add -Wformat and and fix some compile warnings with gcc 4.3. Fixes bug #537129 (Cosimo Cecchi).


Modified:
   trunk/libempathy-gtk/empathy-ui-utils.c
   trunk/m4/acinclude.m4
   trunk/src/empathy-status-icon.c

Modified: trunk/libempathy-gtk/empathy-ui-utils.c
==============================================================================
--- trunk/libempathy-gtk/empathy-ui-utils.c	(original)
+++ trunk/libempathy-gtk/empathy-ui-utils.c	Sat Jun  7 17:23:13 2008
@@ -1325,7 +1325,7 @@
 						 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),

Modified: trunk/m4/acinclude.m4
==============================================================================
--- trunk/m4/acinclude.m4	(original)
+++ trunk/m4/acinclude.m4	Sat Jun  7 17:23:13 2008
@@ -29,9 +29,9 @@
 	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])

Modified: trunk/src/empathy-status-icon.c
==============================================================================
--- trunk/src/empathy-status-icon.c	(original)
+++ trunk/src/empathy-status-icon.c	Sat Jun  7 17:23:13 2008
@@ -554,7 +554,8 @@
 
 		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);