Merge lp://staging/geis/2.x into lp://staging/geis

Proposed by Stephen M. Webb
Status: Merged
Merged at revision: 92
Proposed branch: lp://staging/geis/2.x
Merge into: lp://staging/geis
Diff against target: 1288 lines (+956/-39)
22 files modified
ChangeLog (+49/-0)
doc/Doxyfile (+1/-1)
include/geis/geis.h (+61/-6)
libutouch-geis/Makefile.am (+9/-5)
libutouch-geis/geis.c (+79/-11)
libutouch-geis/geis_backend.c (+65/-0)
libutouch-geis/geis_backend.h (+56/-0)
libutouch-geis/geis_backend_multiplexor.c (+203/-0)
libutouch-geis/geis_backend_multiplexor.h (+129/-0)
libutouch-geis/geis_backend_protected.h (+61/-0)
libutouch-geis/geis_backend_test_fixture.c (+63/-0)
libutouch-geis/geis_backend_test_fixture.h (+35/-0)
libutouch-geis/geis_error.c (+4/-4)
libutouch-geis/geis_private.h (+4/-7)
testsuite/geis2/check_config.c (+2/-2)
testsuite/geis2/check_error_codes.c (+2/-0)
testsuite/geis2/check_geis_new.c (+1/-1)
testsuite/geis2/check_subscription.c (+1/-1)
testsuite/libutouch-geis/Makefile.am (+1/-0)
testsuite/libutouch-geis/check_backend_multiplexor.c (+127/-0)
testsuite/libutouch-geis/check_geis2_internals.c (+2/-0)
testsuite/libutouch-geis/check_subscription.c (+1/-1)
To merge this branch: bzr merge lp://staging/geis/2.x
Reviewer Review Type Date Requested Status
Mohamed IKBEL Boulabiar (community) Approve
Henrik Rydberg (community) Approve
Review via email: mp+42536@code.staging.launchpad.net

Description of the change

This change is some basic infrastructure required for configurable back ends (eg. DBus client, local grail, maverick-style XCB).

To post a comment you must log in.
Revision history for this message
Henrik Rydberg (rydberg) wrote :

Looks ok. Things are getting closer. :-)

Revision history for this message
Henrik Rydberg (rydberg) wrote :

> Looks ok. Things are getting closer. :-)

review: Approve
Revision history for this message
Chase Douglas (chasedouglas) wrote :

Do we want to be able to specify a timeout value for geis_backend_multiplexor_pump?

Otherwise, looks good to me.

Revision history for this message
Mohamed IKBEL Boulabiar (boulabiar) wrote :

Looks Good !

("teh", "isn;t" in the comments detected :P)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: