SF.net SVN: geany:[5147] branches/Geany-0_19_1

[ntrel at users.sourceforge.net]

Revision: 5147
          http://geany.svn.sourceforge.net/geany/?rev=5147&view=rev
Author:   ntrel
Date:     2010-08-12 12:30:16 +0000 (Thu, 12 Aug 2010)

Log Message:
-----------
r5104 | ntrel | 2010-07-12 18:09:57 +0100 (Mon, 12 Jul 2010) | 4 lines

Focus toolbar item when pressing Go to Line keybinding only when
it's not in the toolbar's drop down overflow menu (fixes #3027454).

Modified Paths:
--------------
    branches/Geany-0_19_1/ChangeLog
    branches/Geany-0_19_1/src/keybindings.c

Modified: branches/Geany-0_19_1/ChangeLog
===================================================================
--- branches/Geany-0_19_1/ChangeLog	2010-08-12 12:28:46 UTC (rev 5146)
+++ branches/Geany-0_19_1/ChangeLog	2010-08-12 12:30:16 UTC (rev 5147)
@@ -1,3 +1,10 @@
+2010-07-12  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/keybindings.c:
+   Focus toolbar item when pressing Go to Line keybinding only when
+   it's not in the toolbar's drop down overflow menu (fixes #3027454).
+
+
 2010-07-11  Lex Trotman  <elextr(at)gmail(dot)com>
 
  * src/build.c:

Modified: branches/Geany-0_19_1/src/keybindings.c
===================================================================
--- branches/Geany-0_19_1/src/keybindings.c	2010-08-12 12:28:46 UTC (rev 5146)
+++ branches/Geany-0_19_1/src/keybindings.c	2010-08-12 12:30:16 UTC (rev 5147)
@@ -1990,8 +1990,8 @@
 			{
 				GtkWidget *wid = toolbar_get_widget_child_by_name("GotoEntry");
 
-				/* use toolbar item if shown */
-				if (wid)
+				/* use toolbar item if shown & not in the drop down overflow menu */
+				if (wid && GTK_WIDGET_MAPPED(wid))
 				{
 					gtk_widget_grab_focus(wid);
 					return TRUE;


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