summaryrefslogtreecommitdiff
path: root/src/ephy-location-action.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-01-29 21:47:22 +0000
committerChristian Persch <chpe@src.gnome.org>2006-01-29 21:47:22 +0000
commitbf0ea37b5138af83fde8e7aaba16669c4e43fd9c (patch)
tree0577a38705f373970c0f167ca73b34e24a33ecd0 /src/ephy-location-action.c
parent34e421be7f10496d476266e656ddffe00b42b4e7 (diff)
downloadepiphany-bf0ea37b5138af83fde8e7aaba16669c4e43fd9c.tar.gz
Add a convenience function to get current event data.
2006-01-29 Christian Persch <chpe@cvs.gnome.org> * lib/ephy-gui.c: (ephy_gui_get_current_event): * lib/ephy-gui.h: Add a convenience function to get current event data. * src/ephy-link.c: (ephy_link_open), (ephy_link_flags_from_current_event): * src/ephy-link.h: Add a convenience function to translate the current event into EphyLinkFlags. * src/ephy-go-action.c: (ephy_go_action_get_type): * src/ephy-go-action.h: Make this an EphyLinkAction. * lib/widgets/ephy-location-entry.c: (entry_key_press_cb): * src/ephy-home-action.c: (ephy_home_action_activate): * src/ephy-location-action.c: (entry_activate_cb): * src/ephy-tab.c: (open_link_in_new), (ephy_tab_dom_mouse_click_cb): * src/window-commands.c: (window_cmd_load_location): Fix link activation to respect ctrl and shift modifiers. Part of bug #310814. 2006-01-29 Christian Persch <chpe@cvs.gnome.org>
Diffstat (limited to 'src/ephy-location-action.c')
-rw-r--r--src/ephy-location-action.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c
index a15bd41d7..922f14298 100644
--- a/src/ephy-location-action.c
+++ b/src/ephy-location-action.c
@@ -149,8 +149,6 @@ entry_activate_cb (GtkEntry *entry,
EphyLocationAction *action)
{
EphyBookmarks *bookmarks;
- GdkEvent *event;
- gboolean control = FALSE;
const char *content;
char *address;
@@ -162,21 +160,8 @@ entry_activate_cb (GtkEntry *entry,
address = ephy_bookmarks_resolve_address (bookmarks, content, NULL);
g_return_if_fail (address != NULL);
- event = gtk_get_current_event ();
- if (event)
- {
- if (event->type == GDK_KEY_PRESS ||
- event->type == GDK_KEY_RELEASE)
- {
- control = (event->key.state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK;
- }
-
- gdk_event_free (event);
- }
-
- /* FIXME use ephy_bookmarks_resolve_address here too? */
ephy_link_open (EPHY_LINK (action), address, NULL,
- control ? EPHY_LINK_NEW_TAB : 0);
+ ephy_link_flags_from_current_event ());
g_free (address);
}