SF.net SVN: geany:[4237] trunk

[ntrel at users.sourceforge.net]

Revision: 4237
          http://geany.svn.sourceforge.net/geany/?rev=4237&view=rev
Author:   ntrel
Date:     2009-09-27 10:51:44 +0000 (Sun, 27 Sep 2009)

Log Message:
-----------
Only focus toolbar goto line entry when pressing keybinding if it's
visible (patch by Eugene Arshinov, thanks).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-09-24 17:15:43 UTC (rev 4236)
+++ trunk/ChangeLog	2009-09-27 10:51:44 UTC (rev 4237)
@@ -1,3 +1,10 @@
+2009-09-27  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/keybindings.c:
+   Only focus toolbar goto line entry when pressing keybinding if it's
+   visible (patch by Eugene Arshinov, thanks).
+
+
 2009-09-24  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * THANKS, src/about.c, src/highlighting.c, data/filetypes.xml:

Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c	2009-09-24 17:15:43 UTC (rev 4236)
+++ trunk/src/keybindings.c	2009-09-27 10:51:44 UTC (rev 4237)
@@ -1834,13 +1834,18 @@
 			return;
 		case GEANY_KEYS_GOTO_LINE:
 		{
-			GtkWidget *wid = toolbar_get_widget_child_by_name("GotoEntry");
+			if (toolbar_prefs.visible)
+			{
+				GtkWidget *wid = toolbar_get_widget_child_by_name("GotoEntry");
 
-			/* use toolbar item if shown */
-			if (wid)
-				gtk_widget_grab_focus(wid);
-			else
-				on_go_to_line_activate(NULL, NULL);
+				/* use toolbar item if shown */
+				if (wid)
+				{
+					gtk_widget_grab_focus(wid);
+					return;
+				}
+			}
+			on_go_to_line_activate(NULL, NULL);
 			return;
 		}
 		case GEANY_KEYS_GOTO_MATCHINGBRACE:


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