Merge lp://staging/geis/client-arch into lp://staging/geis
Proposed by
Stephen M. Webb
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/geis/client-arch |
Merge into: | lp://staging/geis |
Diff against target: |
9682 lines (+7292/-647) 88 files modified
.bzrignore (+7/-1) Makefile.am (+1/-0) configure.ac (+4/-1) include/geis/geis.h (+11/-8) libs/Makefile.am (+1/-1) libs/geis-dbus/Makefile.am (+41/-0) libs/geis-dbus/geis_dbus.h (+37/-8) libs/geis-dbus/geis_dbus_attr.c (+178/-0) libs/geis-dbus/geis_dbus_attr.h (+57/-0) libs/geis-dbus/geis_dbus_class.c (+126/-0) libs/geis-dbus/geis_dbus_class.h (+45/-0) libs/geis-dbus/geis_dbus_device.c (+152/-0) libs/geis-dbus/geis_dbus_device.h (+61/-0) libs/geis-dbus/geis_dbus_dispatcher.c (+486/-0) libs/geis-dbus/geis_dbus_dispatcher.h (+116/-0) libs/geis-dbus/geis_dbus_gesture_event.c (+516/-0) libs/geis-dbus/geis_dbus_gesture_event.h (+55/-0) libs/geis-dbus/geis_dbus_region.c (+91/-0) libs/geis-dbus/geis_dbus_region.h (+47/-0) libs/geis-dbus/geis_dbus_subscription.c (+506/-0) libs/geis-dbus/geis_dbus_subscription.h (+206/-0) libutouch-geis/Makefile.am (+5/-0) libutouch-geis/backend/Makefile.am (+1/-1) libutouch-geis/backend/dbus/Makefile.am (+34/-0) libutouch-geis/backend/dbus/geis_dbus_backend.c (+248/-0) libutouch-geis/backend/dbus/geis_dbus_client.c (+685/-0) libutouch-geis/backend/dbus/geis_dbus_client.h (+97/-0) libutouch-geis/backend/dbus/geis_dbus_locator.c (+268/-0) libutouch-geis/backend/dbus/geis_dbus_locator.h (+62/-0) libutouch-geis/backend/test_fixture/geis_backend_test_fixture.c (+7/-5) libutouch-geis/backend/xcb/geis_xcb_backend.c (+10/-8) libutouch-geis/backend/xcb/geis_xcb_backend_token.c (+4/-4) libutouch-geis/backend/xcb/grail_gestures.c (+1/-1) libutouch-geis/geis.c (+166/-158) libutouch-geis/geis_attr.c (+143/-0) libutouch-geis/geis_attr.h (+16/-0) libutouch-geis/geis_backend.c (+2/-0) libutouch-geis/geis_backend_multiplexor.c (+183/-74) libutouch-geis/geis_backend_multiplexor.h (+51/-15) libutouch-geis/geis_backend_protected.h (+2/-2) libutouch-geis/geis_backend_token.c (+6/-4) libutouch-geis/geis_backend_token.h (+32/-9) libutouch-geis/geis_class.c (+2/-2) libutouch-geis/geis_class.h (+1/-1) libutouch-geis/geis_device.h (+1/-1) libutouch-geis/geis_filter.c (+83/-0) libutouch-geis/geis_filter.h (+51/-0) libutouch-geis/geis_filter_term.c (+120/-0) libutouch-geis/geis_filter_term.h (+8/-0) libutouch-geis/geis_filterable.c (+151/-0) libutouch-geis/geis_filterable.h (+116/-0) libutouch-geis/geis_gesture_flick.c (+1/-1) libutouch-geis/geis_private.h (+65/-59) libutouch-geis/geis_subscription.c (+73/-10) libutouch-geis/geis_subscription.h (+53/-0) libutouch-geis/geis_timer.c (+5/-4) libutouch-geis/geis_v1.c (+104/-45) libutouch-geis/server/Makefile.am (+5/-2) libutouch-geis/server/geis_dbus_announcer.c (+233/-0) libutouch-geis/server/geis_dbus_announcer.h (+54/-0) libutouch-geis/server/geis_dbus_client_proxy.c (+486/-0) libutouch-geis/server/geis_dbus_client_proxy.h (+60/-0) libutouch-geis/server/geis_dbus_proxy_box.c (+199/-0) libutouch-geis/server/geis_dbus_proxy_box.h (+115/-0) libutouch-geis/server/geis_dbus_server.c (+278/-154) libutouch-geis/server/geis_dbus_server.h (+70/-30) python/_geis_bindings/_geis_bindings.c (+3/-2) python/geis/__init__.py (+6/-4) testsuite/geis2/check_class.c (+1/-1) testsuite/geis2/check_config.c (+1/-1) testsuite/geis2/check_device.c (+1/-1) testsuite/geis2/check_filter.c (+1/-1) testsuite/geis2/check_frame.c (+1/-1) testsuite/geis2/check_geis_new.c (+1/-1) testsuite/geis2/check_region.c (+1/-1) testsuite/geis2/check_subscription.c (+1/-1) testsuite/libutouch-geis/Makefile.am (+1/-0) testsuite/libutouch-geis/check_backend_multiplexor.c (+6/-2) testsuite/libutouch-geis/check_backend_token.c (+1/-1) testsuite/libutouch-geis/check_filter.c (+1/-1) testsuite/libutouch-geis/check_geis_private.c (+4/-3) testsuite/libutouch-geis/check_region.c (+1/-1) testsuite/libutouch-geis/check_subscription.c (+1/-1) testsuite/libutouch-geis/check_timer.c (+1/-1) tools/Makefile.am (+1/-1) tools/geis-server/Makefile.am (+33/-0) tools/geis-server/geis-server.c (+85/-0) tools/geisview/geisview (+39/-13) |
To merge this branch: | bzr merge lp://staging/geis/client-arch |
Related bugs: | |
Related blueprints: |
OIF gesture integration into compiz
(Essential)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chase Douglas (community) | Needs Information | ||
Review via email: mp+79329@code.staging.launchpad.net |
This proposal has been superseded by a proposal from 2011-10-17.
Description of the change
Adds selectable client-server architecture using a private DBus.
I think at this point (most) functionality is there. May need some polish over the next cycle.
To post a comment you must log in.
Added a trunk synch to resolve some merge conflicts.