diff --git a/po/de.po b/po/de.po
index 46b09f5..7bb8abf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Editor 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 22:47+0200\n"
+"POT-Creation-Date: 2010-04-07 22:49+0200\n"
 "PO-Revision-Date: 2010-04-07 22:05+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: German\n"
@@ -16,35 +16,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/callbacks.c:82
+#: ../src/callbacks.c:81
 msgid "Text editor preferences"
 msgstr ""
 
-#: ../src/callbacks.c:91
+#: ../src/callbacks.c:90
 msgid "Font:"
 msgstr ""
 
-#: ../src/callbacks.c:262
+#: ../src/callbacks.c:260
 msgid "About Editor"
 msgstr ""
 
-#: ../src/callbacks.c:273
+#: ../src/callbacks.c:271
 msgid "C_redits"
 msgstr ""
 
-#: ../src/callbacks.c:277
+#: ../src/callbacks.c:275
 msgid "_License"
 msgstr ""
 
-#: ../src/callbacks.c:327
+#: ../src/callbacks.c:325
 msgid "Credits"
 msgstr ""
 
-#: ../src/callbacks.c:350
+#: ../src/callbacks.c:348
 msgid "Written by"
 msgstr ""
 
-#: ../src/callbacks.c:379
+#: ../src/callbacks.c:377
 msgid "License"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 548cb13..87cbbdb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Editor 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 22:47+0200\n"
+"POT-Creation-Date: 2010-04-07 22:49+0200\n"
 "PO-Revision-Date: 2010-04-07 22:07+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Spanish\n"
@@ -16,35 +16,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/callbacks.c:82
+#: ../src/callbacks.c:81
 msgid "Text editor preferences"
 msgstr ""
 
-#: ../src/callbacks.c:91
+#: ../src/callbacks.c:90
 msgid "Font:"
 msgstr ""
 
-#: ../src/callbacks.c:262
+#: ../src/callbacks.c:260
 msgid "About Editor"
 msgstr ""
 
-#: ../src/callbacks.c:273
+#: ../src/callbacks.c:271
 msgid "C_redits"
 msgstr ""
 
-#: ../src/callbacks.c:277
+#: ../src/callbacks.c:275
 msgid "_License"
 msgstr ""
 
-#: ../src/callbacks.c:327
+#: ../src/callbacks.c:325
 msgid "Credits"
 msgstr ""
 
-#: ../src/callbacks.c:350
+#: ../src/callbacks.c:348
 msgid "Written by"
 msgstr ""
 
-#: ../src/callbacks.c:379
+#: ../src/callbacks.c:377
 msgid "License"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 1006c58..2eaf783 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Editor 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 22:47+0200\n"
+"POT-Creation-Date: 2010-04-07 22:49+0200\n"
 "PO-Revision-Date: 2010-04-07 22:08+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: French\n"
@@ -16,35 +16,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/callbacks.c:82
+#: ../src/callbacks.c:81
 msgid "Text editor preferences"
 msgstr "Préférences de l'éditeur de textes"
 
-#: ../src/callbacks.c:91
+#: ../src/callbacks.c:90
 msgid "Font:"
 msgstr "Police:"
 
-#: ../src/callbacks.c:262
+#: ../src/callbacks.c:260
 msgid "About Editor"
 msgstr "À propos de Editor"
 
-#: ../src/callbacks.c:273
+#: ../src/callbacks.c:271
 msgid "C_redits"
 msgstr "C_rédits"
 
-#: ../src/callbacks.c:277
+#: ../src/callbacks.c:275
 msgid "_License"
 msgstr "_Licence"
 
-#: ../src/callbacks.c:327
+#: ../src/callbacks.c:325
 msgid "Credits"
 msgstr "Crédits"
 
-#: ../src/callbacks.c:350
+#: ../src/callbacks.c:348
 msgid "Written by"
 msgstr "Écrit par"
 
-#: ../src/callbacks.c:379
+#: ../src/callbacks.c:377
 msgid "License"
 msgstr "Licence"
 
diff --git a/src/callbacks.c b/src/callbacks.c
index 34e93b8..dd78294 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -56,8 +56,7 @@ void on_edit_find(gpointer data)
 /* on_edit_preferences */
 static void _preferences_set(Editor * editor);
 static void _preferences_on_cancel(gpointer data);
-static gboolean _preferences_on_closex(GtkWidget * widget, GdkEvent * event,
-		gpointer data);
+static gboolean _preferences_on_closex(gpointer data);
 static void _preferences_on_ok(gpointer data);
 
 void on_edit_preferences(gpointer data)
@@ -82,7 +81,7 @@ void on_edit_preferences(gpointer data)
 			_("Text editor preferences"));
 	gtk_window_set_transient_for(GTK_WINDOW(editor->pr_window), GTK_WINDOW(
 				editor->window));
-	g_signal_connect(G_OBJECT(editor->pr_window), "delete-event",
+	g_signal_connect_swapped(G_OBJECT(editor->pr_window), "delete-event",
 			G_CALLBACK(_preferences_on_closex), editor);
 	vbox = gtk_vbox_new(FALSE, 0);
 	hbox = gtk_hbox_new(FALSE, 0);
@@ -134,8 +133,7 @@ static void _preferences_on_cancel(gpointer data)
 	_preferences_set(editor);
 }
 
-static gboolean _preferences_on_closex(GtkWidget * widget, GdkEvent * event,
-		gpointer data)
+static gboolean _preferences_on_closex(gpointer data)
 {
 	Editor * editor = data;