← Back to branch summary

~oif-packaging/grail/raring

« back to all changes in this revision

Viewing changes to tools/grail-test-3-1.c

  • Committer: Chase Douglas
  • Date: 2012-06-21 20:30:14 UTC
  • mto: This revision was merged to the branch mainline in revision 234.
  • Revision ID: chase.douglas@ubuntu.com-20120621203014-g2uhy6mg779aufop
Rename utouch-grail to grail

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/grail-test-3-1.c
1
1
/*****************************************************************************
2
2
 *
3
 
 * utouch-frame - Touch Frame Library
 
3
 * frame - Touch Frame Library
4
4
 *
5
5
 * Copyright (C) 2010-2011 Canonical Ltd.
6
6
 *
26
26
#include <unistd.h>
27
27
 
28
28
#include <X11/extensions/XInput2.h>
29
 
#include <utouch/frame.h>
30
 
#include <utouch/frame_x11.h>
31
 
#include <utouch/grail.h>
 
29
#include <oif/frame.h>
 
30
#include <oif/frame_x11.h>
 
31
#include <oif/grail.h>
32
32
 
33
33
#include "common/device.h"
34
34
#include "common/servertime.h"
273
273
 
274
274
  frame_status = frame_x11_new(display, &frame_handle);
275
275
  if (frame_status != UFStatusSuccess) {
276
 
    fprintf(stderr, "Error: failed to create utouch frame instance\n");
 
276
    fprintf(stderr, "Error: failed to create frame instance\n");
277
277
    return -1;
278
278
  }
279
279
 
283
283
 
284
284
  grail_status = grail_new(frame_handle, &grail_handle);
285
285
  if (grail_status != UGStatusSuccess) {
286
 
    fprintf(stderr, "Error: failed to create utouch grail instance\n");
 
286
    fprintf(stderr, "Error: failed to create grail instance\n");
287
287
    frame_x11_delete(frame_handle);
288
288
    return -1;
289
289
  }