debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use original event to determine midori tab mod

Browse source 
Cast from GdkEventKey* to GdkEventKey* doesn't always work out
This commit is contained in:
André Stösel 2012-03-19 18:35:39 +01:00 committed by Christian Dywan
parent d98edca5f2
commit 0b16c9c95c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
midori/midori-locationaction.c
View file

@ -422,7 +422,7 @@ midori_location_action_add_search_engines (MidoriLocationAction* action,
static void static void
midori_location_action_complete (MidoriLocationAction* action, midori_location_action_complete (MidoriLocationAction* action,
GdkEventButton* event, gboolean new_tab,
const gchar* uri) const gchar* uri)
{ {
if (!strcmp (uri, "about:search")) if (!strcmp (uri, "about:search"))
@ -436,8 +436,7 @@ midori_location_action_complete (MidoriLocationAction* action,
{ {
midori_location_action_popdown_completion (action); midori_location_action_popdown_completion (action);
gtk_entry_set_text (GTK_ENTRY (action->entry), uri); gtk_entry_set_text (GTK_ENTRY (action->entry), uri);
g_signal_emit (action, signals[SUBMIT_URI], 0, uri, g_signal_emit (action, signals[SUBMIT_URI], 0, uri, new_tab);
MIDORI_MOD_NEW_TAB (event->state));
} }
} }
@ -457,7 +456,8 @@ midori_location_action_treeview_button_press_cb (GtkWidget* treeview,
gtk_tree_model_get_iter (action->completion_model, &iter, path); gtk_tree_model_get_iter (action->completion_model, &iter, path);
gtk_tree_path_free (path); gtk_tree_path_free (path);
gtk_tree_model_get (action->completion_model, &iter, URI_COL, &uri, -1); gtk_tree_model_get (action->completion_model, &iter, URI_COL, &uri, -1);
midori_location_action_complete (action, event, uri); midori_location_action_complete (action,
MIDORI_MOD_NEW_TAB (event->state), uri);
g_free (uri); g_free (uri);
return TRUE; return TRUE;
@ -963,7 +963,8 @@ midori_location_action_key_press_event_cb (GtkEntry* entry,
gtk_tree_model_get (model, &iter, URI_COL, &uri, -1); gtk_tree_model_get (model, &iter, URI_COL, &uri, -1);
if (is_enter) if (is_enter)
midori_location_action_complete (location_action, (GdkEventButton*)event, uri); midori_location_action_complete (location_action,
MIDORI_MOD_NEW_TAB (event->state), uri);
else else
{ {
midori_location_action_popdown_completion (location_action); midori_location_action_popdown_completion (location_action);