| Summary: | stop Gabble using things deprecated in 0.20, 0.22 | ||
|---|---|---|---|
| Product: | Telepathy | Reporter: | Simon McVittie <smcv> |
| Component: | gabble | Assignee: | Simon McVittie <smcv> |
| Status: | RESOLVED FIXED | QA Contact: | Telepathy bugs list <telepathy-bugs> |
| Severity: | normal | ||
| Priority: | medium | CC: | xclaesse |
| Version: | git master | Keywords: | patch |
| Hardware: | Other | ||
| OS: | All | ||
| Whiteboard: | |||
| i915 platform: | i915 features: | ||
| Attachments: |
Cache PEP aliases in a hash table, not deprecated handle qdata
Cache vCard aliases in a hash table, not in deprecated handle qdata exec-with-log.sh.in: fix out-of-tree use of GABBLE_TEST_BACKTRACE [1/3] GabbleFtManager: announce incoming FT channels individually GabbleMucFactory: announce tube channels individually Disable deprecated functionality Require tp-glib 0.21.1 and disable 0.22-deprecated functionality regression tests: avoid relying on ye olde Capabilities Remove support for ye olde Capabilities caps/jingle-caps.py: convert test_prefer_phones to Call1 |
||
|
Description
Simon McVittie
2013-09-10 18:53:52 UTC
Created attachment 85582 [details] [review] Cache PEP aliases in a hash table, not deprecated handle qdata Created attachment 85583 [details] [review] Cache vCard aliases in a hash table, not in deprecated handle qdata Created attachment 85584 [details] [review] exec-with-log.sh.in: fix out-of-tree use of GABBLE_TEST_BACKTRACE --- commit name needs amending to what I said here I also need to amend the GabbleFtManager and GabbleMucFactory to announce FTs/tubes individually rather than as a bundle; that's easy, but making the tests cope is harder. Comment on attachment 85583 [details] [review] Cache vCard aliases in a hash table, not in deprecated handle qdata Review of attachment 85583 [details] [review]: ----------------------------------------------------------------- ::: src/vcard-manager.c @@ +1681,5 @@ > g_return_val_if_fail (tp_handle_is_valid (contact_repo, handle, NULL), > FALSE); > > + /* Return TRUE for positively or negatively cached contacts. */ > + return g_hash_table_lookup_extended (priv->alias_cache, g_hash_table_contains() is made for that. +1 for the rest. Created attachment 85632 [details] [review] [1/3] GabbleFtManager: announce incoming FT channels individually tp_channel_manager_emit_new_channels() is deprecated, because announcing bundles of related channels together seemed a nice idea, but it turns out to be really difficult to deal with in practice. This requires some interesting contortions in test-multift.py, which exercised the "bundle of related channels" stuff. --- I applied the other patches, amending Atachment #85583 to use g_hash_table_contains() like you suggested. Created attachment 85633 [details] [review] GabbleMucFactory: announce tube channels individually tp_channel_manager_emit_new_channels() is deprecated, because announcing bundles of related channels together seemed a nice idea, but it turns out to be really difficult to deal with in practice. We preserve the order in which we did things, as much as possible: the text channel is announced (if it's going to be) before any of the tubes. Created attachment 85634 [details] [review] Disable deprecated functionality This might regress if we deprecate more in telepathy-glib 0.21, but still seems worth doing. Comment on attachment 85632 [details] [review] [1/3] GabbleFtManager: announce incoming FT channels individually Review of attachment 85632 [details] [review]: ----------------------------------------------------------------- ++ Comment on attachment 85633 [details] [review] GabbleMucFactory: announce tube channels individually Review of attachment 85633 [details] [review]: ----------------------------------------------------------------- ++ Comment on attachment 85634 [details] [review] Disable deprecated functionality Review of attachment 85634 [details] [review]: ----------------------------------------------------------------- Shouldn't you bump the tp-glib dep as well? (In reply to comment #12) > Comment on attachment 85634 [details] [review] > Disable deprecated functionality ... > Shouldn't you bump the tp-glib dep as well? Yeah, I suppose so. Actually, I should have set the version to 0.22 (with required version actually 0.21.1) straight away - the commit message assumed I had, but I forgot to amend. Created attachment 85646 [details] [review] Require tp-glib 0.21.1 and disable 0.22-deprecated functionality This might regress if we deprecate more in later telepathy-glib 0.21.x versions, but still seems worth doing. Created attachment 85647 [details] [review] regression tests: avoid relying on ye olde Capabilities Telepathy 1.0 won't have these, only ContactCapabilities. We should make sure that deleting Capabilities isn't a test-coverage regression. Created attachment 85650 [details] [review] Remove support for ye olde Capabilities --- caps/advertise-legacy.py is 100% legacy Capabilities, so I deleted it - advertise-contact-caps.py is the modern equivalent. Everything else is OK, I just deleted the old version of the "expectations". Created attachment 85657 [details] [review] caps/jingle-caps.py: convert test_prefer_phones to Call1 --- The Jingle tests in jingle/ all need converting to Call too, before we can drop StreamedMedia, but I've only made slow progress on that. This is a start... Comment on attachment 85646 [details] [review] Require tp-glib 0.21.1 and disable 0.22-deprecated functionality Review of attachment 85646 [details] [review]: ----------------------------------------------------------------- ++ Comment on attachment 85647 [details] [review] regression tests: avoid relying on ye olde Capabilities Review of attachment 85647 [details] [review]: ----------------------------------------------------------------- ++ Comment on attachment 85650 [details] [review] Remove support for ye olde Capabilities Review of attachment 85650 [details] [review]: ----------------------------------------------------------------- ++ Comment on attachment 85657 [details] [review] caps/jingle-caps.py: convert test_prefer_phones to Call1 Review of attachment 85657 [details] [review]: ----------------------------------------------------------------- ++ Merged for 0.19.0, thanks. I'll open a separate bug for deletion of StreamedMedia from the tests. |
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.