SF.net SVN: geany:[4831] trunk

[eht16 at users.sourceforge.net]

Revision: 4831
          http://geany.svn.sourceforge.net/geany/?rev=4831&view=rev
Author:   eht16
Date:     2010-04-18 21:42:12 +0000 (Sun, 18 Apr 2010)

Log Message:
-----------
Fix Ctrl-Click on notebook tab if Numpad is active.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-04-17 16:12:32 UTC (rev 4830)
+++ trunk/ChangeLog	2010-04-18 21:42:12 UTC (rev 4831)
@@ -12,6 +12,8 @@
    Another attempt to fix the PHP parser regexp for parsing functions.
    Fix wrong parsing of function arguments when those contain nested
    brackets (as reported by Harold Aling).
+ * src/notebook.c:
+   Fix Ctrl-Click on notebook tab if Numpad is active.
 
 
 2010-04-11  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/notebook.c
===================================================================
--- trunk/src/notebook.c	2010-04-17 16:12:32 UTC (rev 4830)
+++ trunk/src/notebook.c	2010-04-18 21:42:12 UTC (rev 4831)
@@ -421,6 +421,8 @@
 
 static gboolean notebook_tab_click(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
+	guint state;
+
 	/* toggle additional widgets on double click */
 	if (event->type == GDK_2BUTTON_PRESS)
 	{
@@ -437,7 +439,8 @@
 		return TRUE; /* stop other handlers like notebook_tab_bar_click_cb() */
 	}
 	/* switch last used tab on ctrl-click */
-	if (event->button == 1 && event->state == GDK_CONTROL_MASK)
+	state = event->state & gtk_accelerator_get_default_mod_mask();
+	if (event->button == 1 && state == GDK_CONTROL_MASK)
 	{
 		keybindings_send_command(GEANY_KEY_GROUP_NOTEBOOK,
 			GEANY_KEYS_NOTEBOOK_SWITCHTABLASTUSED);


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