Cancel completion if we don't have an entry

This commit is contained in:
Christian Dywan 2010-03-06 19:18:09 +01:00
parent e7005abd55
commit e69ee84b6b

View file

@ -343,10 +343,10 @@ midori_location_action_popup_timeout_cb (gpointer data)
static sqlite3_stmt* stmt; static sqlite3_stmt* stmt;
const gchar* sqlcmd; const gchar* sqlcmd;
gint matches, searches, height, screen_height, browser_height, sep; gint matches, searches, height, screen_height, browser_height, sep;
MidoriBrowser* browser = midori_browser_get_for_widget (action->entry); MidoriBrowser* browser;
GtkStyle* style; GtkStyle* style;
if (!gtk_widget_has_focus (action->entry) || !action->history) if (!action->entry || !gtk_widget_has_focus (action->entry) || !action->history)
return FALSE; return FALSE;
if (!(action->key && *action->key)) if (!(action->key && *action->key))
@ -495,6 +495,7 @@ midori_location_action_popup_timeout_cb (gpointer data)
gtk_tree_view_columns_autosize (GTK_TREE_VIEW (action->treeview)); gtk_tree_view_columns_autosize (GTK_TREE_VIEW (action->treeview));
} }
browser = midori_browser_get_for_widget (action->entry);
column = gtk_tree_view_get_column (GTK_TREE_VIEW (action->treeview), 0); column = gtk_tree_view_get_column (GTK_TREE_VIEW (action->treeview), 0);
gtk_tree_view_column_cell_get_size (column, NULL, NULL, NULL, NULL, &height); gtk_tree_view_column_cell_get_size (column, NULL, NULL, NULL, NULL, &height);
screen_height = gdk_screen_get_height (gtk_widget_get_screen (action->popup)); screen_height = gdk_screen_get_height (gtk_widget_get_screen (action->popup));