brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2008-01-02 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-model-default.c:
	(clutter_model_default_get_iter_at_row),
	(clutter_model_default_insert_row): Fix off-by-one errors

	(clutter_model_default_class_init):
	(clutter_model_default_remove_row): Move the actual removal of the
	row to...

	(clutter_model_default_row_removed): ... the signal class handler
	of ::row-removed; this way, signal handlers connected to
	::row-removed will get a valid iterator, while signal handlers
	connected to ::row-removed with the AFTER flag will get an updated
	model
This commit is contained in:
Emmanuele Bassi 2008-01-02 12:15:10 +00:00
parent 6ffd3b42d5
commit 7649df9632
2 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2008-01-02 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-model-default.c:
(clutter_model_default_get_iter_at_row),
(clutter_model_default_insert_row): Fix off-by-one errors
(clutter_model_default_class_init):
(clutter_model_default_remove_row): Move the actual removal of the
row to...
(clutter_model_default_row_removed): ... the signal class handler
of ::row-removed; this way, signal handlers connected to
::row-removed will get a valid iterator, while signal handlers
connected to ::row-removed with the AFTER flag will get an updated
model
2007-12-31 Tomas Frydrych <tf@openedhand.com> 2007-12-31 Tomas Frydrych <tf@openedhand.com>
* configure.ac: * configure.ac:

35
clutter/clutter-model-default.c
View File

@ -438,7 +438,7 @@ clutter_model_default_get_iter_at_row (ClutterModel *model,
ClutterModelDefault *model_default = CLUTTER_MODEL_DEFAULT (model); ClutterModelDefault *model_default = CLUTTER_MODEL_DEFAULT (model);
ClutterModelDefaultIter *retval; ClutterModelDefaultIter *retval;
if (row > g_sequence_get_length (model_default->sequence)) if (row >= g_sequence_get_length (model_default->sequence))
return NULL; return NULL;
retval = g_object_new (CLUTTER_TYPE_MODEL_DEFAULT_ITER, retval = g_object_new (CLUTTER_TYPE_MODEL_DEFAULT_ITER,
@ -476,7 +476,7 @@ clutter_model_default_insert_row (ClutterModel *model,
if (index_ < 0) if (index_ < 0)
{ {
seq_iter = g_sequence_append (model_default->sequence, array); seq_iter = g_sequence_append (model_default->sequence, array);
pos = g_sequence_get_length (model_default->sequence) - 1; pos = g_sequence_get_length (model_default->sequence);
} }
else if (index_ == 0) else if (index_ == 0)
{ {
@ -515,7 +515,6 @@ clutter_model_default_remove_row (ClutterModel *model,
if (pos == row) if (pos == row)
{ {
ClutterModelIter *iter; ClutterModelIter *iter;
GValueArray *array;
iter = g_object_new (CLUTTER_TYPE_MODEL_DEFAULT_ITER, iter = g_object_new (CLUTTER_TYPE_MODEL_DEFAULT_ITER,
"model", model, "model", model,
@ -523,15 +522,17 @@ clutter_model_default_remove_row (ClutterModel *model,
NULL); NULL);
CLUTTER_MODEL_DEFAULT_ITER (iter)->seq_iter = seq_iter; CLUTTER_MODEL_DEFAULT_ITER (iter)->seq_iter = seq_iter;
/* the actual row is removed from the sequence inside
* the ::row-removed signal class handler, so that every
* handler connected to ::row-removed will still get
* a valid iterator, and every signal connected to
* ::row-removed with the AFTER flag will get an updated
* model
*/
g_signal_emit_by_name (model, "row-removed", iter); g_signal_emit_by_name (model, "row-removed", iter);
g_object_unref (iter); g_object_unref (iter);
array = g_sequence_get (seq_iter);
g_value_array_free (array);
g_sequence_remove (seq_iter);
break; break;
} }
} }
@ -589,6 +590,22 @@ clutter_model_default_resort (ClutterModel *model,
&sort_closure); &sort_closure);
} }
static void
clutter_model_default_row_removed (ClutterModel *model,
ClutterModelIter *iter)
{
ClutterModelDefaultIter *iter_default;
GValueArray *array;
iter_default = CLUTTER_MODEL_DEFAULT_ITER (iter);
array = g_sequence_get (iter_default->seq_iter);
g_value_array_free (array);
g_sequence_remove (iter_default->seq_iter);
iter_default->seq_iter = NULL;
}
static void static void
clutter_model_default_finalize (GObject *gobject) clutter_model_default_finalize (GObject *gobject)
{ {
@ -621,6 +638,8 @@ clutter_model_default_class_init (ClutterModelDefaultClass *klass)
model_class->insert_row = clutter_model_default_insert_row; model_class->insert_row = clutter_model_default_insert_row;
model_class->remove_row = clutter_model_default_remove_row; model_class->remove_row = clutter_model_default_remove_row;
model_class->resort = clutter_model_default_resort; model_class->resort = clutter_model_default_resort;
model_class->row_removed = clutter_model_default_row_removed;
} }
static void static void