From 68a0e805a67b73daff0558f3b33e10be256a9d3a Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Thu, 11 Jun 2015 10:27:24 -0400
Subject: [PATCH] Remove conflicting keyboard shortcut for the preferences

---
 src/editor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/editor.c b/src/editor.c
index 30f0971..73274b1 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -185,7 +185,7 @@ static const DesktopMenu _editor_menu_edit[] =
 		GDK_CONTROL_MASK, GDK_KEY_F },
 	{ "", NULL, NULL, 0, 0 },
 	{ N_("_Preferences"), G_CALLBACK(on_edit_preferences),
-		GTK_STOCK_PREFERENCES, GDK_CONTROL_MASK, GDK_KEY_P },
+		GTK_STOCK_PREFERENCES, 0, 0 },
 	{ NULL, NULL, NULL, 0, 0 }
 };