← Back to branch summary

~fginther/grail/grail-2.0.1.1-oneiric

« back to all changes in this revision

Viewing changes to src/gestures-pinch.c

  • Committer: Francis Ginther
  • Date: 2012-08-22 18:35:11 UTC
  • mfrom: (20.2.19 upstream)
  • Revision ID: francis.ginther@canonical.com-20120822183511-yxwny2hixhyu2z42
https://launchpad.net/bugs/1040218
* New upstream microrelease, bug fixes only
  - Rename project to simply 'grail' (LP: #1040218)
* Updated debian/watch file for project rename

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gestures-pinch.c
37
37
static void set_props(const struct gesture_inserter *gin,
38
38
                      struct combo_model *s,
39
39
                      const struct move_model *m,
40
 
                      const struct utouch_frame *frame)
 
40
                      const struct oif_frame *frame)
41
41
{
42
42
        s->prop[GRAIL_PROP_PINCH_DR] = m->fm[FM_R].action_delta;
43
43
        s->prop[GRAIL_PROP_PINCH_VR] = m->fm[FM_R].velocity;
49
49
}
50
50
 
51
51
int gru_pinch(struct grail *ge,
52
 
              const struct utouch_frame *frame)
 
52
              const struct oif_frame *frame)
53
53
{
54
54
        struct gesture_recognizer *gru = ge->gru;
55
55
        struct combo_model *state = &gru->pinch;
85
85
}
86
86
 
87
87
int gru_winpinch(struct grail *ge,
88
 
                 const struct utouch_frame *frame)
 
88
                 const struct oif_frame *frame)
89
89
{
90
90
        struct gesture_recognizer *gru = ge->gru;
91
91
        struct combo_model *state = &gru->winpinch;