← Back to branch summary

~ubuntu-branches/ubuntu/vivid/clutter-1.0/vivid-proposed

« back to all changes in this revision

Viewing changes to clutter/clutter-list-model.c

  • Committer: Package Import Robot
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2014-03-26 11:51:28 UTC
  • mfrom: (1.5.1) (4.1.30 experimental)
  • Revision ID: package-import@ubuntu.com-20140326115128-timmbsde8734o6wz
Tags: 1.18.0-1
* New upstream release.
* debian/control.in:
  + Bump gtk-doc-tools build dependency.
  + Also break libcogl15.
  + Standards-Version is 3.9.5, no changes needed.
* debian/libclutter-1.0-0.symbols:
  + Drop a few symbols that were accidentally exported in the DSO because
    they had a clutter_ prefix but were not in the public headers.
  + Add one new symbol.
  + Drop unnecessary debian revisions from some symbols.
* debian/control.in,
  debian/rules,
  debian/libclutter-1.0-0.symbols:
  + Temporarily disable evdev input support. It was only enabled in 1.17.6-1
    in experimental and there is nothing using it yet, and I would like to
    wait a bit before uploading libinput to unstable as the ABI isn't stable
    yet.
* d/p/0001-wayland-Add-missing-CLUTTER_AVAILABLE-annotations.patch:
  + Add missing annotations so that a few symbols are exported in the DSO.

* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clutter/clutter-list-model.c
76
76
typedef struct _ClutterListModelIter    ClutterListModelIter;
77
77
typedef struct _ClutterModelIterClass   ClutterListModelIterClass;
78
78
 
79
 
#define CLUTTER_LIST_MODEL_GET_PRIVATE(obj)     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_LIST_MODEL, ClutterListModelPrivate))
80
 
 
81
79
struct _ClutterListModelPrivate
82
80
{
83
81
  GSequence *sequence;
102
100
 
103
101
G_DEFINE_TYPE (ClutterListModelIter,
104
102
               clutter_list_model_iter,
105
 
               CLUTTER_TYPE_MODEL_ITER);
 
103
               CLUTTER_TYPE_MODEL_ITER)
106
104
 
107
105
static void
108
106
clutter_list_model_iter_get_value (ClutterModelIter *iter,
434
432
 * ClutterListModel
435
433
 */
436
434
 
437
 
G_DEFINE_TYPE (ClutterListModel, clutter_list_model, CLUTTER_TYPE_MODEL);
 
435
G_DEFINE_TYPE_WITH_PRIVATE (ClutterListModel, clutter_list_model, CLUTTER_TYPE_MODEL)
438
436
 
439
437
static ClutterModelIter *
440
438
clutter_list_model_get_iter_at_row (ClutterModel *model,
698
696
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
699
697
  ClutterModelClass *model_class = CLUTTER_MODEL_CLASS (klass);
700
698
 
701
 
  g_type_class_add_private (klass, sizeof (ClutterListModelPrivate));
702
 
 
703
699
  gobject_class->finalize = clutter_list_model_finalize;
704
700
  gobject_class->dispose = clutter_list_model_dispose;
705
701
 
706
702
  model_class->get_iter_at_row = clutter_list_model_get_iter_at_row;
707
 
  model_class->insert_row      = clutter_list_model_insert_row;
708
 
  model_class->remove_row      = clutter_list_model_remove_row;
709
 
  model_class->resort          = clutter_list_model_resort;
710
 
  model_class->get_n_rows      = clutter_list_model_get_n_rows;
711
 
 
712
 
  model_class->row_removed     = clutter_list_model_row_removed;
 
703
  model_class->insert_row = clutter_list_model_insert_row;
 
704
  model_class->remove_row = clutter_list_model_remove_row;
 
705
  model_class->resort = clutter_list_model_resort;
 
706
  model_class->get_n_rows = clutter_list_model_get_n_rows;
 
707
  model_class->row_removed = clutter_list_model_row_removed;
713
708
}
714
709
 
715
710
static void
716
711
clutter_list_model_init (ClutterListModel *model)
717
712
{
718
 
  model->priv = CLUTTER_LIST_MODEL_GET_PRIVATE (model);
 
713
  model->priv = clutter_list_model_get_instance_private (model);
719
714
 
720
715
  model->priv->sequence = g_sequence_new (NULL);
721
716
  model->priv->temp_iter = g_object_new (CLUTTER_TYPE_LIST_MODEL_ITER,