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

Disconnect history panel when finalizing

Browse source 
There's a small hack now which prevents the disconnect function
from releasing the references. Our reference handling is flawed
and needs to be investigated before we can fix that for good.
This commit is contained in:
Christian Dywan 2009-05-15 20:08:06 +02:00
parent 90e9ee4af7
commit 396c477f2d
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
panels/midori-history.c
View file

@ -274,7 +274,8 @@ midori_history_clear_cb (KatzeArray* array,
static void static void
midori_history_disconnect_folder (MidoriHistory* history, midori_history_disconnect_folder (MidoriHistory* history,
KatzeArray* array) KatzeArray* array,
gboolean unref)
{ {
KatzeItem* item; KatzeItem* item;
guint i; guint i;
@ -292,8 +293,9 @@ midori_history_disconnect_folder (MidoriHistory* history,
while ((item = katze_array_get_nth_item (array, i++))) while ((item = katze_array_get_nth_item (array, i++)))
{ {
if (KATZE_IS_ARRAY (item)) if (KATZE_IS_ARRAY (item))
midori_history_disconnect_folder (history, KATZE_ARRAY (item)); midori_history_disconnect_folder (history, KATZE_ARRAY (item), TRUE);
g_object_unref (item); if (unref)
g_object_unref (item);
} }
} }
@ -308,6 +310,7 @@ midori_history_add_item_cb (KatzeArray* array,
g_return_if_fail (KATZE_IS_ARRAY (array)); g_return_if_fail (KATZE_IS_ARRAY (array));
g_return_if_fail (KATZE_IS_ITEM (added_item)); g_return_if_fail (KATZE_IS_ITEM (added_item));
g_return_if_fail (MIDORI_IS_HISTORY (history));
if (KATZE_IS_ARRAY (added_item)) if (KATZE_IS_ARRAY (added_item))
{ {
@ -391,7 +394,7 @@ midori_history_remove_item_cb (KatzeArray* array,
g_assert (KATZE_IS_ITEM (removed_item)); g_assert (KATZE_IS_ITEM (removed_item));
if (KATZE_IS_ARRAY (removed_item)) if (KATZE_IS_ARRAY (removed_item))
midori_history_disconnect_folder (history, KATZE_ARRAY (removed_item)); midori_history_disconnect_folder (history, KATZE_ARRAY (removed_item), TRUE);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview));
midori_history_remove_iter (model, NULL, removed_item); midori_history_remove_iter (model, NULL, removed_item);
@ -423,7 +426,7 @@ midori_history_clear_cb (KatzeArray* array,
midori_history_remove_item_cb (array, item, history); midori_history_remove_item_cb (array, item, history);
} }
midori_history_disconnect_folder (history, array); midori_history_disconnect_folder (history, array, TRUE);
} }
static void static void
@ -480,7 +483,7 @@ midori_history_set_app (MidoriHistory* history,
if (history->array) if (history->array)
{ {
midori_history_disconnect_folder (history, history->array); midori_history_disconnect_folder (history, history->array, TRUE);
g_object_unref (history->array); g_object_unref (history->array);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview));
gtk_tree_store_clear (GTK_TREE_STORE (model)); gtk_tree_store_clear (GTK_TREE_STORE (model));
@ -966,6 +969,11 @@ midori_history_finalize (GObject* object)
if (history->app) if (history->app)
g_object_unref (history->app); g_object_unref (history->app);
/* FIXME: We don't unref items (last argument is FALSE) because
our reference counting is incorrect. */
midori_history_disconnect_folder (history, history->array, FALSE);
g_object_unref (history->array); g_object_unref (history->array);
} }