← Back to branch summary

~oif-team/geis/trunk

« back to all changes in this revision

Viewing changes to libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c

  • Committer: Stephen M. Webb
  • Date: 2011-10-18 20:30:02 UTC
  • mfrom: (158.1.42 client-arch)
  • Revision ID: stephen.webb@canonical.com-20111018203002-ne8h3n25fbey3fqr
Merged client-arch branch.

Provided a new DBus-client back end and a dbus-server facility.  Included a test driver for the server.  Made the DBus client the default back-end with an automatic fall back to the XCB back end for seamless support of existing client software.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c
77
77
static GeisBackendToken _token_clone(GeisBackendToken);
78
78
static void             _token_finalize(GeisBackendToken);
79
79
static void             _token_compose(GeisBackendToken, GeisBackendToken);
80
 
static GeisStatus       _token_activate(GeisBackendToken);
81
 
static GeisStatus       _token_deactivate(GeisBackendToken);
 
80
static GeisStatus       _token_activate(GeisBackendToken, GeisSubscription);
 
81
static GeisStatus       _token_deactivate(GeisBackendToken, GeisSubscription);
82
82
 
83
83
static struct GeisBackendTokenVtable _token_vtbl = {
84
84
  _token_clone,
361
361
 
362
362
 
363
363
GeisStatus             
364
 
_token_activate(GeisBackendToken gbtoken)
 
364
_token_activate(GeisBackendToken gbtoken,
 
365
                GeisSubscription subscription GEIS_UNUSED)
365
366
{
366
367
  GeisStatus status = GEIS_STATUS_SUCCESS;
367
368
  TestBackendToken token = _tbtoken_from_token(gbtoken);
371
372
 
372
373
 
373
374
GeisStatus             
374
 
_token_deactivate(GeisBackendToken gbtoken GEIS_UNUSED)
 
375
_token_deactivate(GeisBackendToken gbtoken GEIS_UNUSED,
 
376
                  GeisSubscription subscription GEIS_UNUSED)
375
377
{
376
378
  GeisStatus status = GEIS_STATUS_SUCCESS;
377
379
  return status;
381
383
__attribute__((constructor))
382
384
static void _register_test_fixture()
383
385
{
384
 
  geis_register_backend(GEIS_INIT_UTOUCH_MOCK_ENGINE,
 
386
  geis_register_backend(GEIS_INIT_UTOUCH_MOCK_BACKEND,
385
387
                        sizeof(struct GeisBackendTestFixture),
386
388
                        &tf_vtbl);
387
389
}