Bug 69767

Summary: Haze: update 'next' branch to spec/tp-glib 0.99.1
Product: Telepathy Reporter: Simon McVittie <smcv>
Component: hazeAssignee: Simon McVittie <smcv>
Status: RESOLVED FIXED QA Contact: Telepathy bugs list <telepathy-bugs>
Severity: normal    
Priority: medium Keywords: patch
Version: git master   
Hardware: Other   
OS: All   
Whiteboard:
i915 platform: i915 features:
Bug Depends on:    
Bug Blocks: 69431    
Attachments: Text tests: use the Messages interface

Description Simon McVittie 2013-09-24 18:34:46 UTC
The branch says it all.

> Use the "undrafted" version of MailNotification

This should happen in master too (the only mechanical difference seems to be the nonexistence of Subscribe(), which is a no-op in Haze anyway) but since Haze already has an outdated 'next' branch which doesn't compile, I think making it compile again > perfection. I'll do the change on master too, and merge it or something.

> gabbletest: don't use GetStatus()

Please say "r+ for Gabble and Haze master" if you approve :-)

> tests: update ContactList API to 0.99.1

We could maybe restrict master to ContactsChangedWithID only, but I don't think it's necessarily worth it.

> Text tests: migrate to the unified Text interface in spec 0.99.1

They should be made Messages-only on master, but again, making 'next' compile > perfection: if we don't merge it, the merge will get even larger and more conflicty.

I know I've been insisting on "fix it on master and rebase next" for all the other CMs - that's because when the 'next' branch exists, it'll be too late to do the rebasing, and you'll have merges like this, which I really don't want to make any harder :-)

<http://cgit.freedesktop.org/~smcv/telepathy-haze/commit/?h=next&id=ebb6fd0b79c047c69895dab48d167aec88c46aa7>
Comment 1 Guillaume Desmottes 2013-09-25 07:29:51 UTC
(In reply to comment #0)
> The branch says it all.
> 
> > Use the "undrafted" version of MailNotification
> 
> This should happen in master too (the only mechanical difference seems to be
> the nonexistence of Subscribe(), which is a no-op in Haze anyway) but since
> Haze already has an outdated 'next' branch which doesn't compile, I think
> making it compile again > perfection. I'll do the change on master too, and
> merge it or something.

That's bug #69468 btw.
Comment 2 Guillaume Desmottes 2013-09-25 07:31:52 UTC
Patches look good, including the gabbletest change for Gabble as well.
Comment 3 Simon McVittie 2013-09-25 14:55:49 UTC
All merged, thanks. One more...
Comment 4 Simon McVittie 2013-09-25 14:56:27 UTC
Created attachment 86560 [details] [review]
Text tests: use the Messages interface

This makes them more like the ones in 'next', which use the newly
unified Text interface (whose API is mostly based on Messages).
Comment 5 Guillaume Desmottes 2013-09-26 09:27:13 UTC
Comment on attachment 86560 [details] [review]
Text tests: use the Messages interface

Review of attachment 86560 [details] [review]:
-----------------------------------------------------------------

++
Comment 6 Simon McVittie 2013-09-26 18:44:54 UTC
Fixed, thanks.

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.