From a6ab365cbb0363443ce9f6518f4410493eaed140 Mon Sep 17 00:00:00 2001
From: Rob Kendrick <rjek@netsurf-browser.org>
Date: Tue, 6 Mar 2007 23:33:05 +0000
Subject: Apply Darren Salt's patch to implement Open Location/Ctrl-L in nsgtk

svn path=/trunk/netsurf/; revision=3200
---
 gtk/gtk_scaffolding.c | 11 +++++++++++
 gtk/res/netsurf.glade |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/gtk/gtk_scaffolding.c b/gtk/gtk_scaffolding.c
index cb5d1d1a8..425612309 100644
--- a/gtk/gtk_scaffolding.c
+++ b/gtk/gtk_scaffolding.c
@@ -104,6 +104,7 @@ static void nsgtk_attach_menu_handlers(GladeXML *, gpointer);
 /* prototypes for menu handlers */
 /* file menu */
 MENUPROTO(new_window);
+MENUPROTO(open_location);
 MENUPROTO(close_window);
 MENUPROTO(quit);
 
@@ -135,6 +136,7 @@ MENUPROTO(about);
 static struct menu_events menu_events[] = {
 	/* file menu */
 	MENUEVENT(new_window),
+	MENUEVENT(open_location),
 	MENUEVENT(close_window),
 	MENUEVENT(quit),
 
@@ -343,6 +345,15 @@ MENUHANDLER(new_window)
 	return TRUE;
 }
 
+MENUHANDLER(open_location)
+{
+	struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g;
+
+	gtk_widget_grab_focus(gw->url_bar);
+
+	return TRUE;
+}
+
 MENUHANDLER(close_window)
 {
 	struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g;
diff --git a/gtk/res/netsurf.glade b/gtk/res/netsurf.glade
index 55fdefe20..cf39f888e 100644
--- a/gtk/res/netsurf.glade
+++ b/gtk/res/netsurf.glade
@@ -64,7 +64,7 @@
 		  <child>
 		    <widget class="GtkMenuItem" id="open_location">
 		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
+		      <property name="sensitive">True</property>
 		      <property name="tooltip" translatable="yes">Open an address into this browser window.</property>
 		      <property name="label" translatable="yes">Open _location...</property>
 		      <property name="use_underline">True</property>
-- 
cgit v1.2.3