SF.net SVN: geany:[3338] trunk

[eht16 at users.sourceforge.net]

Revision: 3338
          http://geany.svn.sourceforge.net/geany/?rev=3338&view=rev
Author:   eht16
Date:     2008-12-07 19:11:13 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
Fix pressing escape in the sidebar and toolbar focus the editor.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-12-07 13:40:48 UTC (rev 3337)
+++ trunk/ChangeLog	2008-12-07 19:11:13 UTC (rev 3338)
@@ -1,3 +1,9 @@
+2008-12-07  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/callbacks.c:
+   Fix pressing escape in the sidebar and toolbar focus the editor.
+
+
 2008-12-06  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * scintilla/scintilla_changes.patch:

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2008-12-07 13:40:48 UTC (rev 3337)
+++ trunk/src/callbacks.c	2008-12-07 19:11:13 UTC (rev 3338)
@@ -2104,8 +2104,10 @@
                                         GdkEventKey     *event,
                                         gpointer         user_data)
 {
+	guint state = event->state & GEANY_KEYS_MODIFIER_MASK;
+
 	/* make pressing escape in the sidebar and toolbar focus the editor */
-	if (event->keyval == GDK_Escape && event->state == 0)
+	if (event->keyval == GDK_Escape && state == 0)
 	{
 		keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR);
 		return TRUE;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.