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

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

Browse Source 
Merge from clutter-0-6:

	* clutter/clutter-model.c:
	(clutter_model_iter_set_internal_valist): Add an internal function
	wrapping ClutterModelIter::set_value that does not emit the
	::row-changed signal. Emitting this signal before the ::row-added
	one is wrong: a row cannot change before being inserted.

	(clutter_model_append), (clutter_model_prepend),
	(clutter_model_insert): Use the non-signal emitting variant of
	clutter_model_iter_set_valist().

	(clutter_model_iter_set_valist): Use the internal version and emit
	the ::row-changed signal at the end.
This commit is contained in:
Emmanuele Bassi 2008-06-01 19:57:42 +00:00
parent a4e4faff1d
commit 3ab2ff9846
2 changed files with 54 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2008-06-01 Emmanuele Bassi <ebassi@openedhand.com>
Merge from clutter-0-6:
* clutter/clutter-model.c:
(clutter_model_iter_set_internal_valist): Add an internal function
wrapping ClutterModelIter::set_value that does not emit the
::row-changed signal. Emitting this signal before the ::row-added
one is wrong: a row cannot change before being inserted.
(clutter_model_append), (clutter_model_prepend),
(clutter_model_insert): Use the non-signal emitting variant of
clutter_model_iter_set_valist().
(clutter_model_iter_set_valist): Use the internal version and emit
the ::row-changed signal at the end.
2008-05-31 Emmanuele Bassi <ebassi@openedhand.com> 2008-05-31 Emmanuele Bassi <ebassi@openedhand.com>
Bug #943 - Signals are only emitted within a certain area of Bug #943 - Signals are only emitted within a certain area of

55
clutter/clutter-model.c
View File

@ -736,6 +736,10 @@ clutter_model_appendv (ClutterModel *model,
g_object_unref (iter); g_object_unref (iter);
} }
/* forward declaration */
static void clutter_model_iter_set_internal_valist (ClutterModelIter *iter,
va_list args);
/** /**
* clutter_model_append: * clutter_model_append:
* @model: a #ClutterModel * @model: a #ClutterModel
@ -769,8 +773,9 @@ clutter_model_append (ClutterModel *model,
iter = CLUTTER_MODEL_GET_CLASS (model)->insert_row (model, -1); iter = CLUTTER_MODEL_GET_CLASS (model)->insert_row (model, -1);
g_assert (CLUTTER_IS_MODEL_ITER (iter)); g_assert (CLUTTER_IS_MODEL_ITER (iter));
/* do not emit the ::row-changed signal */
va_start (args, model); va_start (args, model);
clutter_model_iter_set_valist (iter, args); clutter_model_iter_set_internal_valist (iter, args);
va_end (args); va_end (args);
g_signal_emit (model, model_signals[ROW_ADDED], 0, iter); g_signal_emit (model, model_signals[ROW_ADDED], 0, iter);
@ -859,7 +864,7 @@ clutter_model_prepend (ClutterModel *model,
g_assert (CLUTTER_IS_MODEL_ITER (iter)); g_assert (CLUTTER_IS_MODEL_ITER (iter));
va_start (args, model); va_start (args, model);
clutter_model_iter_set_valist (iter, args); clutter_model_iter_set_internal_valist (iter, args);
va_end (args); va_end (args);
g_signal_emit (model, model_signals[ROW_ADDED], 0, iter); g_signal_emit (model, model_signals[ROW_ADDED], 0, iter);
@ -906,7 +911,7 @@ clutter_model_insert (ClutterModel *model,
* passed columns matches the model sorting column index * passed columns matches the model sorting column index
*/ */
va_start (args, row); va_start (args, row);
clutter_model_iter_set_valist (iter, args); clutter_model_iter_set_internal_valist (iter, args);
va_end (args); va_end (args);
g_signal_emit (model, model_signals[ROW_ADDED], 0, iter); g_signal_emit (model, model_signals[ROW_ADDED], 0, iter);
@ -1599,27 +1604,15 @@ clutter_model_iter_init (ClutterModelIter *self)
* Public functions * Public functions
*/ */
/** static void
* clutter_model_iter_set_valist: clutter_model_iter_set_internal_valist (ClutterModelIter *iter,
* @iter: a #ClutterModelIter va_list args)
* @args: va_list of column/value pairs, terminiated by -1
*
* See clutter_model_iter_set(); this version takes a va_list for language
* bindings.
*
* Since: 0.6
*/
void
clutter_model_iter_set_valist (ClutterModelIter *iter,
va_list args)
{ {
ClutterModel *model; ClutterModel *model;
ClutterModelIterPrivate *priv; ClutterModelIterPrivate *priv;
guint column = 0; guint column = 0;
gboolean sort = FALSE; gboolean sort = FALSE;
g_return_if_fail (CLUTTER_IS_MODEL_ITER (iter));
priv = iter->priv; priv = iter->priv;
model = priv->model; model = priv->model;
g_assert (CLUTTER_IS_MODEL (model)); g_assert (CLUTTER_IS_MODEL (model));
@ -1666,6 +1659,32 @@ clutter_model_iter_set_valist (ClutterModelIter *iter,
priv->ignore_sort = FALSE; priv->ignore_sort = FALSE;
if (sort) if (sort)
clutter_model_resort (model); clutter_model_resort (model);
}
/**
* clutter_model_iter_set_valist:
* @iter: a #ClutterModelIter
* @args: va_list of column/value pairs, terminiated by -1
*
* See clutter_model_iter_set(); this version takes a va_list for language
* bindings.
*
* Since: 0.6
*/
void
clutter_model_iter_set_valist (ClutterModelIter *iter,
va_list args)
{
ClutterModelIterPrivate *priv;
ClutterModel *model;
g_return_if_fail (CLUTTER_IS_MODEL_ITER (iter));
clutter_model_iter_set_internal_valist (iter, args);
priv = iter->priv;
model = priv->model;
g_assert (CLUTTER_IS_MODEL (model));
g_signal_emit (model, model_signals[ROW_CHANGED], 0, iter); g_signal_emit (model, model_signals[ROW_CHANGED], 0, iter);
} }