aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-10-17 20:40:59 +0800
committerMilan Crha <mcrha@redhat.com>2012-10-17 20:40:59 +0800
commitbac4efc7ced9ec16f6cdc30959797d8fe3cffde1 (patch)
treef47458538cbe24fd884c0b0fbdac43d8b5213b1d
parentf12ec068f993121f8dc8a3170591d21be6a2a665 (diff)
downloadgsoc2013-evolution-bac4efc7ced9ec16f6cdc30959797d8fe3cffde1.tar
gsoc2013-evolution-bac4efc7ced9ec16f6cdc30959797d8fe3cffde1.tar.gz
gsoc2013-evolution-bac4efc7ced9ec16f6cdc30959797d8fe3cffde1.tar.bz2
gsoc2013-evolution-bac4efc7ced9ec16f6cdc30959797d8fe3cffde1.tar.lz
gsoc2013-evolution-bac4efc7ced9ec16f6cdc30959797d8fe3cffde1.tar.xz
gsoc2013-evolution-bac4efc7ced9ec16f6cdc30959797d8fe3cffde1.tar.zst
gsoc2013-evolution-bac4efc7ced9ec16f6cdc30959797d8fe3cffde1.zip
Add format checker (in compile time) to e_notice()
-rw-r--r--calendar/gui/itip-utils.c7
-rw-r--r--e-util/e-dialog-utils.h2
-rw-r--r--shell/e-shell-window-actions.c11
3 files changed, 7 insertions, 13 deletions
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 350fb5d850..b7b31dbf48 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -1123,11 +1123,8 @@ comp_server_send (ECalComponentItipMethod method,
_("Unable to book a resource, the "
"new event collides with some other."));
} else {
- gchar *msg = g_strconcat (
- _("Unable to book a resource, error: "),
- error->message, NULL);
- e_notice (NULL, GTK_MESSAGE_ERROR, msg);
- g_free (msg);
+ e_notice (NULL, GTK_MESSAGE_ERROR,
+ _("Unable to book a resource, error: %s"), error->message);
}
retval = FALSE;
diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h
index d1e8b900c0..f4f04b0eac 100644
--- a/e-util/e-dialog-utils.h
+++ b/e-util/e-dialog-utils.h
@@ -28,6 +28,6 @@
void e_notice (gpointer parent,
GtkMessageType type,
const gchar *format,
- ...);
+ ...) G_GNUC_PRINTF (3, 4);
#endif /* E_DIALOG_UTILS_H */
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 247b3814cc..ece1c24d8b 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -1222,13 +1222,10 @@ action_submit_bug_cb (GtkAction *action,
g_spawn_command_line_async (command_line, &error);
if (error != NULL) {
- const gchar *message;
-
- if (error->code == G_SPAWN_ERROR_NOENT)
- message = _("Bug Buddy is not installed.");
- else
- message = _("Bug Buddy could not be run.");
- e_notice (shell_window, GTK_MESSAGE_ERROR, message);
+ e_notice (shell_window, GTK_MESSAGE_ERROR,
+ error->code == G_SPAWN_ERROR_NOENT ?
+ _("Bug Buddy is not installed.") :
+ _("Bug Buddy could not be run."));
g_error_free (error);
}
}