tags 643404 patch
stop
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gyrus-0.3.10/src/gyrus-admin.c ./src/gyrus-admin.c
--- ../orig/gyrus-0.3.10/src/gyrus-admin.c 2010-12-29 01:31:16.000000000 +0100
+++ ./src/gyrus-admin.c 2011-10-04 04:31:06.000000000 +0200
@@ -1471,11 +1471,11 @@
if (!duplicated) {
if (!gyrus_admin_acl_set_entry (admin, mailbox,
newname, rights, &error)) {
- g_warning (error);
+ g_warning ("%s", error);
g_free (error);
} else if (!gyrus_admin_acl_delete_entry (admin, mailbox,
oldname, &error)) {
- g_warning (error);
+ g_warning ("%s", error);
g_free (error);
} else {
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
@@ -1486,16 +1486,16 @@
/* DELETE EXISTING ONE */
if (!gyrus_admin_acl_delete_entry (admin, mailbox,
newname, &error)) {
- g_warning (error);
+ g_warning ("%s", error);
g_free (error);
} else if (!gyrus_admin_acl_set_entry (admin, mailbox,
newname, rights,
&error)) {
- g_warning (error);
+ g_warning ("%s", error);
g_free (error);
} else if (!gyrus_admin_acl_delete_entry (admin, mailbox,
oldname, &error)) {
- g_warning (error);
+ g_warning ("%s", error);
g_free (error);
} else {
/* All OK! */
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gyrus-0.3.10/src/gyrus-admin-mailbox.c ./src/gyrus-admin-mailbox.c
--- ../orig/gyrus-0.3.10/src/gyrus-admin-mailbox.c 2010-12-29 00:57:44.000000000 +0100
+++ ./src/gyrus-admin-mailbox.c 2011-10-04 04:32:19.000000000 +0200
@@ -163,7 +163,7 @@
/* sets the quota info in the screen */
if (quota_limit < 0)
g_sprintf (str_quota_limit,
- msg);
+ "%s", msg);
else
gyrus_admin_mailbox_get_human_quota (quota_limit,
str_quota_limit);
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gyrus-0.3.10/src/gyrus-common.c ./src/gyrus-common.c
--- ../orig/gyrus-0.3.10/src/gyrus-common.c 2010-12-29 00:52:13.000000000 +0100
+++ ./src/gyrus-common.c 2011-10-04 04:33:00.000000000 +0200
@@ -36,7 +36,7 @@
GtkWidget *dialog;
dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
- type, GTK_BUTTONS_OK, message);
+ type, GTK_BUTTONS_OK, "%s", message);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gyrus-0.3.10/src/gyrus-session.c ./src/gyrus-session.c
--- ../orig/gyrus-0.3.10/src/gyrus-session.c 2010-12-29 00:52:13.000000000 +0100
+++ ./src/gyrus-session.c 2011-10-04 04:31:16.000000000 +0200
@@ -658,7 +658,7 @@
aux->sep_char = g_strdup (".");
else if (error) {
aux->sep_char = g_strdup (".");
- g_warning (error->message);
+ g_warning ("%s", error->message);
g_error_free (error);
}
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gyrus-0.3.10/src/Makefile.in ./src/Makefile.in
--- ../orig/gyrus-0.3.10/src/Makefile.in 2010-12-29 01:17:53.000000000 +0100
+++ ./src/Makefile.in 2011-10-04 04:34:12.000000000 +0200
@@ -260,7 +260,7 @@
gyrus-report.c gyrus-report.h \
gyrus-session.c gyrus-session.h
-gyrus_LDADD = $(GYRUS_LIBS)
+gyrus_LDADD = $(GYRUS_LIBS) -lm
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-recursive
