Index: src/dialog.c
===================================================================
--- src/dialog.c
+++ src/dialog.c	2009-01-03 22:14:48.000000000 +0100
@@ -31,22 +31,23 @@
 	va_list ap;
 	GtkWidget *dialog;
 	gchar *str;
-	
+
 	va_start(ap, message);
 		str = g_strdup_vprintf(message, ap);
 	va_end(ap);
-	
+
 	dialog = gtk_message_dialog_new(GTK_WINDOW(window),
 		GTK_DIALOG_DESTROY_WITH_PARENT,
 		type,
 		GTK_BUTTONS_NONE,
-		str);
+		"%s",
+                str);
 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
 		GTK_STOCK_OK, GTK_RESPONSE_CANCEL, NULL);
 	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL);
 	g_free(str);
-	
+
 	gtk_dialog_run(GTK_DIALOG(dialog));
 	gtk_widget_destroy(dialog);
 }
@@ -56,11 +57,11 @@
 	va_list ap;
 	GtkWidget *dialog;
 	gchar *str;
-	
+
 	va_start(ap, message);
 		str = g_strdup_vprintf(message, ap);
 	va_end(ap);
-	
+
 	dialog = gtk_message_dialog_new(GTK_WINDOW(window),
 		GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_MESSAGE_QUESTION,
@@ -71,10 +72,10 @@
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_NO, GTK_RESPONSE_NO,
 		GTK_STOCK_YES, GTK_RESPONSE_YES,
-		NULL); 
+		NULL);
 	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES);
 	g_free(str);
-	
+
 	return dialog;
 }
 
@@ -84,17 +85,17 @@
 	GtkWidget *dialog;
 	gchar *str;
 	gint res;
-	
+
 	va_start(ap, message);
 		str = g_strdup_vprintf(message, ap);
 	va_end(ap);
-	
+
 	dialog = create_dialog_message_question(window, str);
 	g_free(str);
-	
+
 	res = gtk_dialog_run(GTK_DIALOG(dialog));
 	gtk_widget_destroy(dialog);
-	
+
 	return res;
 }
 
@@ -127,11 +128,11 @@
 	GtkWidget *label;
 	gchar *str;
 	gint i = 0;
-	
+
 	const gchar *env;
 	const gchar *translator = NULL;
 	gchar *translation;
-	
+
 	str = g_strdup_printf(_("About %s"), PACKAGE_NAME);
 	dialog = gtk_dialog_new_with_buttons(
 		str,
@@ -141,18 +142,18 @@
 		NULL);
 	g_free(str);
 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
-	
+
 	vbox = gtk_vbox_new(FALSE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, FALSE, FALSE, 0);
-	
+
 	icon = gtk_image_new_from_file(iconpath);
 	gtk_box_pack_start (GTK_BOX (vbox), icon, FALSE, FALSE, 0);
-	
+
 	margin = gtk_vbox_new(FALSE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(margin), 4);
 	gtk_box_pack_start(GTK_BOX(vbox), margin, FALSE, FALSE, 0);
-	
+
 	/* TODO: use array */
 	env = g_getenv("LC_ALL");
 	if (!env)
@@ -169,7 +170,7 @@
 		translation = g_strdup_printf("\n<small>Translation &#169; %s</small>", translator);
 	else
 		translation = g_strdup("");
- 	
+
 	label = gtk_label_new(NULL);
 	str = g_strdup_printf(
 		"<span size=\"xx-large\" weight=\"heavy\">%s %s</span>\n<span size=\"xx-small\">\n</span>%s\n<span size=\"xx-small\">\n</span><small>%s</small>%s",
@@ -179,7 +180,7 @@
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	g_free(str);
 	g_free(translation);
-	
+
 	gtk_widget_show_all(vbox);
 	gtk_dialog_run(GTK_DIALOG(dialog));
 	gtk_widget_destroy(dialog);
Index: src/dialog.c
===================================================================
--- src/dialog.c
+++ src/dialog.c	2009-01-03 22:17:33.000000000 +0100
@@ -66,7 +66,8 @@
 		GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_MESSAGE_QUESTION,
 		GTK_BUTTONS_NONE,
-		str);
+		"%s",
+                str);
 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,