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

Remove unused non-object support from KatzeArray

Browse source
This commit is contained in:
Christian Dywan 2010-11-29 23:09:33 +01:00
parent b7c8ef9c4e
commit 1581c13460
1 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
katze/katze-array.c
View file

@ -74,15 +74,10 @@ static void
_katze_array_add_item (KatzeArray* array, _katze_array_add_item (KatzeArray* array,
gpointer item) gpointer item)
{ {
if (katze_array_is_a (array, G_TYPE_OBJECT)) GType type = G_OBJECT_TYPE (item);
{ g_object_ref (item);
GType type = G_OBJECT_TYPE (item); if (g_type_is_a (type, KATZE_TYPE_ITEM))
katze_item_set_parent (item, array);
/* g_return_if_fail (katze_array_is_a (array, type)); */
g_object_ref (item);
if (g_type_is_a (type, KATZE_TYPE_ITEM))
katze_item_set_parent (item, array);
}
array->items = g_list_append (array->items, item); array->items = g_list_append (array->items, item);
} }
@ -93,12 +88,9 @@ _katze_array_remove_item (KatzeArray* array,
{ {
array->items = g_list_remove (array->items, item); array->items = g_list_remove (array->items, item);
if (katze_array_is_a (array, G_TYPE_OBJECT)) if (KATZE_IS_ITEM (item))
{ katze_item_set_parent (item, NULL);
if (KATZE_IS_ITEM (item)) g_object_unref (item);
katze_item_set_parent (item, NULL);
g_object_unref (item);
}
} }
static void static void
@ -195,7 +187,7 @@ katze_array_class_init (KatzeArrayClass* class)
static void static void
katze_array_init (KatzeArray* array) katze_array_init (KatzeArray* array)
{ {
array->type = G_TYPE_NONE; array->type = G_TYPE_OBJECT;
array->items = NULL; array->items = NULL;
} }
@ -204,16 +196,12 @@ katze_array_finalize (GObject* object)
{ {
KatzeArray* array; KatzeArray* array;
guint i; guint i;
gpointer item;
array = KATZE_ARRAY (object); array = KATZE_ARRAY (object);
if (katze_array_is_a (array, G_TYPE_OBJECT)) i = 0;
{ while ((item = g_list_nth_data (array->items, i++)))
gpointer item; g_object_unref (item);
i = 0;
while ((item = g_list_nth_data (array->items, i++)))
g_object_unref (item);
}
g_list_free (array->items); g_list_free (array->items);
G_OBJECT_CLASS (katze_array_parent_class)->finalize (object); G_OBJECT_CLASS (katze_array_parent_class)->finalize (object);
@ -225,8 +213,6 @@ katze_array_finalize (GObject* object)
* *
* Creates a new #KatzeArray for @type items. * Creates a new #KatzeArray for @type items.
* *
* You may only add items of the given type or inherited
* from it to this array *if* @type is an #GObject type.
* The array will keep a reference on each object until * The array will keep a reference on each object until
* it is removed from the array. * it is removed from the array.
* *
@ -235,14 +221,17 @@ katze_array_finalize (GObject* object)
KatzeArray* KatzeArray*
katze_array_new (GType type) katze_array_new (GType type)
{ {
KatzeArray* array = g_object_new (KATZE_TYPE_ARRAY, NULL); KatzeArray* array;
g_return_val_if_fail (g_type_is_a (type, G_TYPE_OBJECT), NULL);
array = g_object_new (KATZE_TYPE_ARRAY, NULL);
array->type = type; array->type = type;
return array; return array;
} }
/** /**
*
* katze_array_is_a: * katze_array_is_a:
* @array: a #KatzeArray * @array: a #KatzeArray
* @is_a_type: type to compare with * @is_a_type: type to compare with
@ -371,9 +360,6 @@ katze_array_find_token (KatzeArray* array,
guint i; guint i;
gpointer item; gpointer item;
if (!katze_array_is_a (array, G_TYPE_OBJECT))
return NULL;
i = 0; i = 0;
while ((item = g_list_nth_data (array->items, i++))) while ((item = g_list_nth_data (array->items, i++)))
{ {
@ -410,9 +396,6 @@ katze_array_find_uri (KatzeArray* array,
guint i; guint i;
gpointer item; gpointer item;
if (!katze_array_is_a (array, G_TYPE_OBJECT))
return NULL;
i = 0; i = 0;
while ((item = g_list_nth_data (array->items, i++))) while ((item = g_list_nth_data (array->items, i++)))
{ {