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

Remove a hack which lead to a crash after the last change

Browse source
This commit is contained in:
Christian Dywan 2008-12-15 20:43:05 +01:00
parent 0fb55faf37
commit 2c1f0574a6
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
midori/midori-browser.c
View file

@ -2505,14 +2505,12 @@ midori_browser_model_remove_item (GtkTreeModel* model,
while (gtk_tree_model_iter_nth_child (model, &child_iter, iter, 0)) while (gtk_tree_model_iter_nth_child (model, &child_iter, iter, 0))
gtk_tree_store_remove (GTK_TREE_STORE (model), &child_iter); gtk_tree_store_remove (GTK_TREE_STORE (model), &child_iter);
} }
else
{
parent = katze_item_get_parent (item);
katze_array_remove_item (parent, item);
}
gtk_tree_store_remove (GTK_TREE_STORE (model), iter); gtk_tree_store_remove (GTK_TREE_STORE (model), iter);
g_object_unref (item); g_object_unref (item);
parent = katze_item_get_parent (item);
katze_array_remove_item (parent, item);
} }
static gboolean static gboolean
@ -2534,9 +2532,9 @@ midori_panel_history_key_release_event_cb (GtkWidget* widget,
{ {
location_action = _action_by_name (browser, "Location"); location_action = _action_by_name (browser, "Location");
gtk_tree_model_get (model, &iter, 0, &item, -1); gtk_tree_model_get (model, &iter, 0, &item, -1);
midori_browser_model_remove_item (model, item, &iter);
midori_location_action_delete_item_from_uri ( midori_location_action_delete_item_from_uri (
MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item)); MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item));
midori_browser_model_remove_item (model, item, &iter);
} }
return FALSE; return FALSE;
@ -2937,9 +2935,9 @@ _action_history_delete_activate (GtkAction* action,
{ {
location_action = _action_by_name (browser, "Location"); location_action = _action_by_name (browser, "Location");
gtk_tree_model_get (model, &iter, 0, &item, -1); gtk_tree_model_get (model, &iter, 0, &item, -1);
midori_browser_model_remove_item (model, item, &iter);
midori_location_action_delete_item_from_uri ( midori_location_action_delete_item_from_uri (
MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item)); MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item));
midori_browser_model_remove_item (model, item, &iter);
} }
} }
@ -3060,9 +3058,6 @@ _action_bookmark_delete_activate (GtkAction* action,
gtk_tree_model_get (model, &iter, 0, &item, -1); gtk_tree_model_get (model, &iter, 0, &item, -1);
parent = katze_item_get_parent (item); parent = katze_item_get_parent (item);
katze_array_remove_item (parent, item); katze_array_remove_item (parent, item);
/* FIXME: This is a preliminary hack, until we fix it properly again */
gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
g_object_unref (item);
} }
} }