← Back to branch summary

~fginther/grail/grail-2.0.1.1-oneiric

« back to all changes in this revision

Viewing changes to src/grail-init.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/grail-init.c
147
147
}
148
148
 
149
149
int create_grail2(struct grail_impl *x,
150
 
                  utouch_frame_handle fh,
 
150
                  oif_frame_handle fh,
151
151
                  unsigned int num_frames,
152
152
                  grail_select_callback select,
153
153
                  unsigned int version,
155
155
                  unsigned int frame_size,
156
156
                  unsigned int slot_size)
157
157
{
158
 
        struct utouch_surface *s = utouch_frame_get_surface(fh);
159
 
        unsigned int ntouch = utouch_frame_get_num_slots(fh);
 
158
        struct oif_surface *s = oif_frame_get_surface(fh);
 
159
        unsigned int ntouch = oif_frame_get_num_slots(fh);
160
160
        unsigned int nslot = get_slot_count(ntouch);
161
161
        int i, j;
162
162
 
194
194
        free(x->ctl);
195
195
}
196
196
 
197
 
grail_handle GRAIL_PUBLIC grail_new_raw(utouch_frame_handle fh,
 
197
grail_handle GRAIL_PUBLIC grail_new_raw(oif_frame_handle fh,
198
198
                                        unsigned int num_frames,
199
199
                                        grail_select_callback select,
200
200
                                        unsigned int version,