← 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-zoom-action.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-zoom-action.c
56
56
 
57
57
#include "clutter-debug.h"
58
58
#include "clutter-enum-types.h"
 
59
#include "clutter-gesture-action-private.h"
59
60
#include "clutter-marshal.h"
60
61
#include "clutter-private.h"
61
62
#include "clutter-stage-private.h"
115
116
 
116
117
static guint zoom_signals[LAST_SIGNAL] = { 0, };
117
118
 
118
 
G_DEFINE_TYPE (ClutterZoomAction, clutter_zoom_action, CLUTTER_TYPE_GESTURE_ACTION);
 
119
G_DEFINE_TYPE_WITH_PRIVATE (ClutterZoomAction, clutter_zoom_action, CLUTTER_TYPE_GESTURE_ACTION)
119
120
 
120
121
static void
121
122
capture_point_initial_position (ClutterGestureAction *action,
326
327
}
327
328
 
328
329
static void
 
330
clutter_zoom_action_constructed (GObject *gobject)
 
331
{
 
332
  ClutterGestureAction *gesture;
 
333
 
 
334
  gesture = CLUTTER_GESTURE_ACTION (gobject);
 
335
  clutter_gesture_action_set_threshold_trigger_edge (gesture, CLUTTER_GESTURE_TRIGGER_EDGE_NONE);
 
336
}
 
337
 
 
338
static void
329
339
clutter_zoom_action_class_init (ClutterZoomActionClass *klass)
330
340
{
331
341
  ClutterGestureActionClass *gesture_class =
332
342
    CLUTTER_GESTURE_ACTION_CLASS (klass);
333
343
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
334
344
 
335
 
  g_type_class_add_private (klass, sizeof (ClutterZoomActionPrivate));
336
 
 
 
345
  gobject_class->constructed = clutter_zoom_action_constructed;
337
346
  gobject_class->set_property = clutter_zoom_action_set_property;
338
347
  gobject_class->get_property = clutter_zoom_action_get_property;
339
348
  gobject_class->dispose = clutter_zoom_action_dispose;
400
409
static void
401
410
clutter_zoom_action_init (ClutterZoomAction *self)
402
411
{
403
 
  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_ZOOM_ACTION,
404
 
                                            ClutterZoomActionPrivate);
 
412
  ClutterGestureAction *gesture;
405
413
 
 
414
  self->priv = clutter_zoom_action_get_instance_private (self);
406
415
  self->priv->zoom_axis = CLUTTER_ZOOM_BOTH;
407
416
 
408
 
  clutter_gesture_action_set_n_touch_points (CLUTTER_GESTURE_ACTION (self), 2);
 
417
  gesture = CLUTTER_GESTURE_ACTION (self);
 
418
  clutter_gesture_action_set_n_touch_points (gesture, 2);
409
419
}
410
420
 
411
421
/**