SF.net SVN: geany:[4221] trunk

[ntrel at users.sourceforge.net]

Revision: 4221
          http://geany.svn.sourceforge.net/geany/?rev=4221&view=rev
Author:   ntrel
Date:     2009-09-21 17:11:42 +0000 (Mon, 21 Sep 2009)

Log Message:
-----------
Make 'Go to Line' keybinding focus the toolbar entry if visible.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-09-21 16:46:16 UTC (rev 4220)
+++ trunk/ChangeLog	2009-09-21 17:11:42 UTC (rev 4221)
@@ -20,6 +20,8 @@
    src/prefs.c, src/dialogs.c, src/geanyentryaction.c,
    src/plugindata.h, src/vte.c, src/search.c, src/ui_utils.c:
    Make ui_entry_add_clear_icon() take a GtkEntry, not GtkWidget.
+ * src/keybindings.c:
+   Make 'Go to Line' keybinding focus the toolbar entry if visible.
 
 
 2009-09-20  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c	2009-09-21 16:46:16 UTC (rev 4220)
+++ trunk/src/keybindings.c	2009-09-21 17:11:42 UTC (rev 4221)
@@ -1833,8 +1833,16 @@
 			navqueue_go_forward();
 			return;
 		case GEANY_KEYS_GOTO_LINE:
-			on_go_to_line_activate(NULL, NULL);
+		{
+			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);
 			return;
+		}
 		case GEANY_KEYS_GOTO_MATCHINGBRACE:
 			goto_matching_brace(doc);
 			return;


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