← Back to branch summary

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

« back to all changes in this revision

Viewing changes to clutter/cally/cally-actor.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/cally/cally-actor.c
173
173
static void cally_actor_real_notify_clutter     (GObject    *obj,
174
174
                                                 GParamSpec *pspec);
175
175
 
 
176
struct _CallyActorPrivate
 
177
{
 
178
  GQueue *action_queue;
 
179
  guint   action_idle_handler;
 
180
  GList  *action_list;
 
181
 
 
182
  GList *children;
 
183
};
 
184
 
176
185
G_DEFINE_TYPE_WITH_CODE (CallyActor,
177
186
                         cally_actor,
178
187
                         ATK_TYPE_GOBJECT_ACCESSIBLE,
 
188
                         G_ADD_PRIVATE (CallyActor)
179
189
                         G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT,
180
190
                                                cally_actor_component_interface_init)
181
191
                         G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION,
182
192
                                                cally_actor_action_interface_init));
183
193
 
184
 
#define CALLY_ACTOR_GET_PRIVATE(obj) \
185
 
  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CALLY_TYPE_ACTOR, CallyActorPrivate))
186
 
 
187
 
 
188
 
struct _CallyActorPrivate
189
 
{
190
 
  GQueue *action_queue;
191
 
  guint   action_idle_handler;
192
 
  GList  *action_list;
193
 
 
194
 
  GList *children;
195
 
};
196
 
 
197
194
/**
198
195
 * cally_actor_new:
199
196
 * @actor: a #ClutterActor
287
284
  class->get_n_children      = cally_actor_get_n_children;
288
285
  class->ref_child           = cally_actor_ref_child;
289
286
  class->get_attributes      = cally_actor_get_attributes;
290
 
 
291
 
  g_type_class_add_private (gobject_class, sizeof (CallyActorPrivate));
292
287
}
293
288
 
294
289
static void
295
290
cally_actor_init (CallyActor *cally_actor)
296
291
{
297
 
  CallyActorPrivate *priv = CALLY_ACTOR_GET_PRIVATE (cally_actor);
 
292
  CallyActorPrivate *priv = cally_actor_get_instance_private (cally_actor);
298
293
 
299
294
  cally_actor->priv = priv;
300
295
 
301
 
  priv->action_queue        = NULL;
 
296
  priv->action_queue = NULL;
302
297
  priv->action_idle_handler = 0;
303
298
 
304
299
  priv->action_list = NULL;
306
301
  priv->children = NULL;
307
302
}
308
303
 
309
 
 
310
304
static void
311
305
cally_actor_finalize (GObject *obj)
312
306
{