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

Cope with unset history in midori_location_action_toggle_arrow_cb

Browse source 
If history is unset, we don't have any items to populate the
combobox dropdown with. So we should always hide the button. Also
suppress the popup if we have no history.
This commit is contained in:
Christian Dywan 2010-09-29 01:24:27 +02:00
parent 1a404c50b1
commit 08691b7745
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
midori/midori-locationaction.c
View file

@ -614,23 +614,25 @@ midori_location_action_finalize (GObject* object)
static void static void
midori_location_action_toggle_arrow_cb (GtkWidget* widget, midori_location_action_toggle_arrow_cb (GtkWidget* widget,
MidoriLocationAction* location_action) MidoriLocationAction* location_action)
{ gboolean show = FALSE; {
gboolean show = FALSE;
sqlite3* db;
const gchar* sqlcmd;
sqlite3_stmt* statement;
gint result; gint result;
if (!GTK_IS_BUTTON (widget)) if (!GTK_IS_BUTTON (widget))
return; return;
db = g_object_get_data (G_OBJECT (location_action->history), "db"); if (location_action->history != NULL)
sqlcmd = "SELECT uri FROM history LIMIT 1"; {
sqlite3* db = g_object_get_data (G_OBJECT (location_action->history), "db");
const char* sqlcmd = "SELECT uri FROM history LIMIT 1";
sqlite3_stmt* statement;
sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL);
result = sqlite3_step (statement); result = sqlite3_step (statement);
if (result == SQLITE_ROW) if (result == SQLITE_ROW)
show = TRUE; show = TRUE;
sqlite3_finalize (statement); sqlite3_finalize (statement);
}
sokoke_widget_set_visible (widget, show); sokoke_widget_set_visible (widget, show);
gtk_widget_set_size_request (widget, show ? -1 : 1, show ? -1 : 1); gtk_widget_set_size_request (widget, show ? -1 : 1, show ? -1 : 1);
} }
@ -640,9 +642,6 @@ midori_location_action_toggle_arrow (MidoriLocationAction* location_action)
{ {
GSList* proxies; GSList* proxies;
if (!location_action->history)
return;
proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); proxies = gtk_action_get_proxies (GTK_ACTION (location_action));
for (; proxies != NULL; proxies = g_slist_next (proxies)) for (; proxies != NULL; proxies = g_slist_next (proxies))
if (GTK_IS_TOOL_ITEM (proxies->data)) if (GTK_IS_TOOL_ITEM (proxies->data))
@ -981,7 +980,8 @@ midori_location_action_key_press_event_cb (GtkEntry* entry,
} }
parent = gtk_widget_get_parent (widget); parent = gtk_widget_get_parent (widget);
if (!katze_object_get_boolean (parent, "popup-shown")) if (location_action->history != NULL
&& !katze_object_get_boolean (parent, "popup-shown"))
gtk_combo_box_popup (GTK_COMBO_BOX (parent)); gtk_combo_box_popup (GTK_COMBO_BOX (parent));
return TRUE; return TRUE;
} }
@ -1283,7 +1283,7 @@ midori_location_action_entry_popup_cb (GtkComboBox* combo_box,
GtkListStore* store; GtkListStore* store;
gint result; gint result;
const gchar* sqlcmd; const gchar* sqlcmd;
static sqlite3_stmt* stmt; static sqlite3_stmt* stmt = NULL;
gint matches; gint matches;
store = GTK_LIST_STORE (gtk_combo_box_get_model (combo_box)); store = GTK_LIST_STORE (gtk_combo_box_get_model (combo_box));
@ -1292,7 +1292,10 @@ midori_location_action_entry_popup_cb (GtkComboBox* combo_box,
if (!stmt) if (!stmt)
{ {
sqlite3* db; sqlite3* db;
g_return_if_fail (location_action->history != NULL);
db = g_object_get_data (G_OBJECT (location_action->history), "db"); db = g_object_get_data (G_OBJECT (location_action->history), "db");
g_return_if_fail (db != NULL);
sqlcmd = "SELECT uri, title FROM history" sqlcmd = "SELECT uri, title FROM history"
" GROUP BY uri ORDER BY count() DESC LIMIT ?"; " GROUP BY uri ORDER BY count() DESC LIMIT ?";
sqlite3_prepare_v2 (db, sqlcmd, -1, &stmt, NULL); sqlite3_prepare_v2 (db, sqlcmd, -1, &stmt, NULL);
@ -1409,7 +1412,6 @@ midori_location_action_connect_proxy (GtkAction* action,
renderer, midori_location_entry_render_text_cb, action, NULL); renderer, midori_location_entry_render_text_cb, action, NULL);
gtk_combo_box_set_active (GTK_COMBO_BOX (entry), -1); gtk_combo_box_set_active (GTK_COMBO_BOX (entry), -1);
if (location_action->history)
gtk_container_forall (GTK_CONTAINER (entry), gtk_container_forall (GTK_CONTAINER (entry),
(GtkCallback)midori_location_action_toggle_arrow_cb, action); (GtkCallback)midori_location_action_toggle_arrow_cb, action);
g_signal_connect (entry, "changed", g_signal_connect (entry, "changed",