Merge lp://staging/~bcurtiswx/ubuntu/precise/telepathy-glib/0.18.2-0ubuntu1 into lp://staging/ubuntu/precise/telepathy-glib
Proposed by
Brian Curtis
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Stéphane Graber | ||||
Proposed branch: | lp://staging/~bcurtiswx/ubuntu/precise/telepathy-glib/0.18.2-0ubuntu1 | ||||
Merge into: | lp://staging/ubuntu/precise/telepathy-glib | ||||
Diff against target: |
34403 lines (+5359/-6132) 180 files modified
ChangeLog (+281/-0) Makefile.am (+14/-1) Makefile.in (+26/-4) NEWS (+54/-0) aclocal.m4 (+6/-8) config.guess (+4/-12) config.h.in (+1/-1) config.sub (+6/-13) configure (+42/-67) configure.ac (+10/-7) debian/changelog (+8/-0) debian/patches/ludicrous-timeout-for-lp-buildd.patch (+4/-4) docs/reference/html/TpBaseCallChannel.html (+1/-1) docs/reference/html/TpBaseChannel.html (+62/-62) docs/reference/html/TpBaseConnection.html (+26/-26) docs/reference/html/TpBaseConnectionManager.html (+13/-13) docs/reference/html/TpBaseMediaCallChannel.html (+1/-1) docs/reference/html/TpBaseRoomConfig.html (+20/-20) docs/reference/html/TpCallContentMediaDescription.html (+1/-1) docs/reference/html/TpChannelFactoryIface.html (+6/-6) docs/reference/html/TpChannelIface.html (+2/-2) docs/reference/html/TpChannelManager.html (+5/-5) docs/reference/html/TpDynamicHandleRepo.html (+6/-6) docs/reference/html/TpExportableChannel.html (+19/-19) docs/reference/html/TpIntset.html (+20/-20) docs/reference/html/TpMessage.html (+23/-23) docs/reference/html/TpSignalledMessage.html (+2/-2) docs/reference/html/index.html (+3/-1) docs/reference/html/index.sgml (+1/-0) docs/reference/html/telepathy-glib-TpContactsMixin.html (+6/-6) docs/reference/html/telepathy-glib-TpGroupMixin.html (+5/-5) docs/reference/html/telepathy-glib-TpHeap.html (+2/-2) docs/reference/html/telepathy-glib-TpMessageMixin.html (+13/-13) docs/reference/html/telepathy-glib-TpPresenceMixin.html (+35/-35) docs/reference/html/telepathy-glib-TpPropertiesMixin.html (+12/-12) docs/reference/html/telepathy-glib-TpTextMixin.html (+7/-7) docs/reference/html/telepathy-glib-account-channel-request.html (+27/-27) docs/reference/html/telepathy-glib-account-manager.html (+121/-117) docs/reference/html/telepathy-glib-account.html (+89/-89) docs/reference/html/telepathy-glib-add-dispatch-operation-context.html (+4/-4) docs/reference/html/telepathy-glib-asv.html (+58/-58) docs/reference/html/telepathy-glib-base-client.html (+47/-47) docs/reference/html/telepathy-glib-base-contact-list.html (+55/-55) docs/reference/html/telepathy-glib-base-password-channel.html (+2/-2) docs/reference/html/telepathy-glib-base-protocol.html (+21/-21) docs/reference/html/telepathy-glib-call-channel.html (+4/-4) docs/reference/html/telepathy-glib-call-content.html (+1/-1) docs/reference/html/telepathy-glib-capabilities.html (+33/-33) docs/reference/html/telepathy-glib-channel-auth.html (+73/-73) docs/reference/html/telepathy-glib-channel-contactsearch.html (+33/-33) docs/reference/html/telepathy-glib-channel-dispatch-operation.html (+38/-38) docs/reference/html/telepathy-glib-channel-dispatcher.html (+66/-66) docs/reference/html/telepathy-glib-channel-file-transfer.html (+40/-40) docs/reference/html/telepathy-glib-channel-group.html (+136/-136) docs/reference/html/telepathy-glib-channel-media.html (+136/-136) docs/reference/html/telepathy-glib-channel-request.html (+35/-35) docs/reference/html/telepathy-glib-channel-room.html (+14/-14) docs/reference/html/telepathy-glib-channel-roomlist.html (+34/-34) docs/reference/html/telepathy-glib-channel-text.html (+129/-129) docs/reference/html/telepathy-glib-channel-tube.html (+54/-54) docs/reference/html/telepathy-glib-channel-tubes.html (+125/-125) docs/reference/html/telepathy-glib-channel.html (+108/-108) docs/reference/html/telepathy-glib-cli-anonymity.html (+3/-3) docs/reference/html/telepathy-glib-cli-call-channel.html (+48/-48) docs/reference/html/telepathy-glib-cli-call-content.html (+111/-111) docs/reference/html/telepathy-glib-cli-call-misc.html (+64/-64) docs/reference/html/telepathy-glib-cli-call-stream.html (+103/-103) docs/reference/html/telepathy-glib-cli-service-point.html (+6/-6) docs/reference/html/telepathy-glib-client-channel-factory.html (+2/-2) docs/reference/html/telepathy-glib-client.html (+37/-37) docs/reference/html/telepathy-glib-connection-addressing.html (+18/-18) docs/reference/html/telepathy-glib-connection-aliasing.html (+42/-42) docs/reference/html/telepathy-glib-connection-avatars.html (+80/-80) docs/reference/html/telepathy-glib-connection-balance.html (+3/-3) docs/reference/html/telepathy-glib-connection-caps.html (+37/-37) docs/reference/html/telepathy-glib-connection-cellular.html (+3/-3) docs/reference/html/telepathy-glib-connection-client-types.html (+19/-19) docs/reference/html/telepathy-glib-connection-contact-info.html (+41/-41) docs/reference/html/telepathy-glib-connection-contact-list.html (+136/-136) docs/reference/html/telepathy-glib-connection-contacts.html (+10/-10) docs/reference/html/telepathy-glib-connection-location.html (+26/-26) docs/reference/html/telepathy-glib-connection-mail.html (+22/-22) docs/reference/html/telepathy-glib-connection-manager.html (+60/-60) docs/reference/html/telepathy-glib-connection-powersaving.html (+10/-10) docs/reference/html/telepathy-glib-connection-presence.html (+77/-77) docs/reference/html/telepathy-glib-connection-requests.html (+29/-29) docs/reference/html/telepathy-glib-connection-simple-presence.html (+22/-22) docs/reference/html/telepathy-glib-connection.html (+188/-188) docs/reference/html/telepathy-glib-contact-search-result.html (+1/-1) docs/reference/html/telepathy-glib-contact-search.html (+7/-7) docs/reference/html/telepathy-glib-contact.html (+48/-48) docs/reference/html/telepathy-glib-dbus-properties-mixin.html (+25/-25) docs/reference/html/telepathy-glib-dbus-tube-channel.html (+29/-29) docs/reference/html/telepathy-glib-dbus.html (+179/-179) docs/reference/html/telepathy-glib-debug-sender.html (+11/-11) docs/reference/html/telepathy-glib-debug.html (+6/-6) docs/reference/html/telepathy-glib-defs.html (+1/-1) docs/reference/html/telepathy-glib-errors.html (+13/-13) docs/reference/html/telepathy-glib-file-transfer-channel.html (+63/-63) docs/reference/html/telepathy-glib-gnio-util.html (+10/-10) docs/reference/html/telepathy-glib-gtypes.html (+186/-72) docs/reference/html/telepathy-glib-handle-channels-context.html (+7/-7) docs/reference/html/telepathy-glib-handle-repo.html (+2/-2) docs/reference/html/telepathy-glib-media-interfaces.html (+211/-211) docs/reference/html/telepathy-glib-observe-channels-context.html (+6/-6) docs/reference/html/telepathy-glib-protocol.html (+47/-47) docs/reference/html/telepathy-glib-proxy-dbus-core.html (+61/-61) docs/reference/html/telepathy-glib-proxy-subclass.html (+14/-14) docs/reference/html/telepathy-glib-proxy-tp-properties.html (+35/-35) docs/reference/html/telepathy-glib-proxy.html (+11/-11) docs/reference/html/telepathy-glib-simple-approver.html (+29/-29) docs/reference/html/telepathy-glib-simple-client-factory.html (+20/-20) docs/reference/html/telepathy-glib-simple-handler.html (+33/-33) docs/reference/html/telepathy-glib-simple-observer.html (+31/-31) docs/reference/html/telepathy-glib-simple-password-manager.html (+1/-1) docs/reference/html/telepathy-glib-stream-tube-channel.html (+5/-5) docs/reference/html/telepathy-glib-stream-tube-connection.html (+5/-5) docs/reference/html/telepathy-glib-svc-account.html (+2/-2) docs/reference/html/telepathy-glib-svc-anonymity.html (+2/-2) docs/reference/html/telepathy-glib-svc-channel-auth.html (+1/-1) docs/reference/html/telepathy-glib-svc-channel-call.html (+4/-4) docs/reference/html/telepathy-glib-svc-channel-contactlist.html (+1/-1) docs/reference/html/telepathy-glib-svc-channel-dispatch-operation.html (+2/-2) docs/reference/html/telepathy-glib-svc-channel-dispatcher.html (+13/-13) docs/reference/html/telepathy-glib-svc-channel-file-transfer.html (+8/-8) docs/reference/html/telepathy-glib-svc-channel-ft-metadata.html (+1/-1) docs/reference/html/telepathy-glib-svc-channel-group.html (+1/-1) docs/reference/html/telepathy-glib-svc-channel-room.html (+1/-1) docs/reference/html/telepathy-glib-svc-channel-securable.html (+1/-1) docs/reference/html/telepathy-glib-svc-channel-tube.html (+1/-1) docs/reference/html/telepathy-glib-svc-client.html (+3/-3) docs/reference/html/telepathy-glib-svc-connection.html (+2/-2) docs/reference/html/telepathy-glib-svc-protocol.html (+2/-2) docs/reference/html/telepathy-glib-svc-service-point.html (+2/-2) docs/reference/html/telepathy-glib-svc-tls.html (+1/-1) docs/reference/html/telepathy-glib-svc.html (+72/-72) docs/reference/html/telepathy-glib-text-channel.html (+9/-9) docs/reference/html/telepathy-glib-util.html (+64/-64) docs/reference/telepathy-glib-docs.sgml (+2/-0) docs/reference/version.xml (+1/-1) examples/client/python/Makefile.am (+3/-1) examples/client/python/Makefile.in (+3/-1) examples/client/python/stream-tubes.py/accepter.py (+73/-0) examples/client/python/stream-tubes.py/offerer.py (+104/-0) examples/client/stream-tubes/accepter.c (+3/-2) examples/client/stream-tubes/offerer.c (+20/-12) ltmain.sh (+13/-19) m4/libtool.m4 (+9/-24) telepathy-glib/Makefile.in (+0/-3) telepathy-glib/TelepathyGLib-0.12.gir (+175/-27) telepathy-glib/account-manager.c (+3/-0) telepathy-glib/account.c (+3/-3) telepathy-glib/base-client.c (+4/-4) telepathy-glib/base-connection.c (+1/-1) telepathy-glib/call-channel.c (+8/-7) telepathy-glib/call-content.c (+0/-967) telepathy-glib/call-stream.c (+0/-687) telepathy-glib/channel.c (+1/-1) telepathy-glib/contact.c (+5/-3) telepathy-glib/dbus-properties-mixin.c (+1/-1) telepathy-glib/dbus-tube-channel.c (+3/-3) telepathy-glib/errors.c (+11/-11) telepathy-glib/handle.h (+1/-1) telepathy-glib/introspection.am (+0/-7) telepathy-glib/presence-mixin.c (+22/-34) telepathy-glib/protocol.c (+3/-3) telepathy-glib/proxy.c (+50/-16) telepathy-glib/simple-client-factory.c (+3/-11) telepathy-glib/stream-tube-channel.c (+2/-2) telepathy-glib/stream-tube-connection.c (+5/-5) telepathy-glib/text-channel.c (+8/-8) tests/dbus/proxy-preparation.c (+39/-0) tests/lib/dbus-tube-chan.c (+7/-2) tests/lib/my-conn-proxy.c (+30/-0) tests/lib/my-conn-proxy.h (+9/-0) tools/c-constants-gen.py (+2/-4) tools/glib-gtypes-generator.py (+1/-1) tools/telepathy.am (+12/-3) vala/Makefile.am (+1/-0) vala/Makefile.in (+1/-0) |
||||
To merge this branch: | bzr merge lp://staging/~bcurtiswx/ubuntu/precise/telepathy-glib/0.18.2-0ubuntu1 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Approve | ||
Robert Bruce Park (community) | Approve | ||
Ubuntu branches | Pending | ||
Review via email:
|
To post a comment you must log in.
Unmerged revisions
- 87. By Brian Curtis
-
* New upstream stable release. (LP: #1030416)
- Empathy doesn't display buddy list (LP: #1018504) - 86. By Brian Curtis
-
* New upstream release.
- refreshed patch
Thanks a lot for your work on this, but I'm afraid we have 0.19.6-0ubuntu1 in quantal already.