diff --git a/po/de.po b/po/de.po
index 1e7313b..46b09f5 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:28+0200\n"
+"POT-Creation-Date: 2010-04-07 22:47+0200\n"
 "PO-Revision-Date: 2010-04-07 22:05+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: German\n"
@@ -24,15 +24,15 @@ msgstr ""
 msgid "Font:"
 msgstr ""
 
-#: ../src/callbacks.c:263
+#: ../src/callbacks.c:262
 msgid "About Editor"
 msgstr ""
 
-#: ../src/callbacks.c:274
+#: ../src/callbacks.c:273
 msgid "C_redits"
 msgstr ""
 
-#: ../src/callbacks.c:278
+#: ../src/callbacks.c:277
 msgid "_License"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index ee5eba1..548cb13 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:28+0200\n"
+"POT-Creation-Date: 2010-04-07 22:47+0200\n"
 "PO-Revision-Date: 2010-04-07 22:07+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Spanish\n"
@@ -24,15 +24,15 @@ msgstr ""
 msgid "Font:"
 msgstr ""
 
-#: ../src/callbacks.c:263
+#: ../src/callbacks.c:262
 msgid "About Editor"
 msgstr ""
 
-#: ../src/callbacks.c:274
+#: ../src/callbacks.c:273
 msgid "C_redits"
 msgstr ""
 
-#: ../src/callbacks.c:278
+#: ../src/callbacks.c:277
 msgid "_License"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 55369fa..1006c58 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:28+0200\n"
+"POT-Creation-Date: 2010-04-07 22:47+0200\n"
 "PO-Revision-Date: 2010-04-07 22:08+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: French\n"
@@ -24,15 +24,15 @@ msgstr "Préférences de l'éditeur de textes"
 msgid "Font:"
 msgstr "Police:"
 
-#: ../src/callbacks.c:263
+#: ../src/callbacks.c:262
 msgid "About Editor"
 msgstr "À propos de Editor"
 
-#: ../src/callbacks.c:274
+#: ../src/callbacks.c:273
 msgid "C_redits"
 msgstr "C_rédits"
 
-#: ../src/callbacks.c:278
+#: ../src/callbacks.c:277
 msgid "_License"
 msgstr "_Licence"
 
diff --git a/src/callbacks.c b/src/callbacks.c
index b7f0e08..34e93b8 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -55,10 +55,10 @@ void on_edit_find(gpointer data)
 
 /* on_edit_preferences */
 static void _preferences_set(Editor * editor);
-static void _preferences_on_cancel(GtkWidget * widget, gpointer data);
+static void _preferences_on_cancel(gpointer data);
 static gboolean _preferences_on_closex(GtkWidget * widget, GdkEvent * event,
 		gpointer data);
-static void _preferences_on_ok(GtkWidget * widget, gpointer data);
+static void _preferences_on_ok(gpointer data);
 
 void on_edit_preferences(gpointer data)
 {
@@ -101,12 +101,12 @@ void on_edit_preferences(gpointer data)
 	group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 	widget = gtk_button_new_from_stock(GTK_STOCK_OK);
 	gtk_size_group_add_widget(group, widget);
-	g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(
+	g_signal_connect_swapped(G_OBJECT(widget), "clicked", G_CALLBACK(
 				_preferences_on_ok), editor);
 	gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, TRUE, 4);
 	widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
 	gtk_size_group_add_widget(group, widget);
-	g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(
+	g_signal_connect_swapped(G_OBJECT(widget), "clicked", G_CALLBACK(
 				_preferences_on_cancel), editor);
 	gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
 	gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 4);
@@ -126,7 +126,7 @@ static void _preferences_set(Editor * editor)
 			editor->font);
 }
 
-static void _preferences_on_cancel(GtkWidget * widget, gpointer data)
+static void _preferences_on_cancel(gpointer data)
 {
 	Editor * editor = data;
 
@@ -139,11 +139,11 @@ static gboolean _preferences_on_closex(GtkWidget * widget, GdkEvent * event,
 {
 	Editor * editor = data;
 
-	_preferences_on_cancel(widget, editor);
+	_preferences_on_cancel(editor);
 	return TRUE;
 }
 
-static void _preferences_on_ok(GtkWidget * widget, gpointer data)
+static void _preferences_on_ok(gpointer data)
 {
 	Editor * editor = data;
 	char const * font;