1
commit a9187b5e59f9bc14d8a9425f5610626bd9a2558c
2
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
3
Date: 2010-04-08 14:07:48 +0100
7
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
9
commit 7fcf2daaa1b1ccbfc155215a0112c90d487257b9
10
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
11
Date: 2010-04-08 14:07:29 +0100
15
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
17
commit 5b229826b54ef29f942d42196dca50be92334bcc
18
Merge: 7e62e6d 8eefb12
19
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
20
Date: 2010-04-08 14:01:59 +0100
24
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
26
commit 7e62e6de36f316e43d67355d2dacd71c1691597a
27
Author: Olivier Le Thanh Duong <olivier@lethanh.be>
28
Date: 2010-04-05 13:30:44 +0200
30
Message iface: Use async_callbacks to return before emitting the signals
32
commit 7b3c91b609d2b988777941b6f7469a0a841e808a
33
Author: Olivier Le Thanh Duong <olivier@lethanh.be>
34
Date: 2010-04-05 13:13:53 +0200
36
Message iface: Use constants instead of magic strings
38
commit f35aa4e37fa479a3781709ae3a942829a81444bb
39
Author: Olivier Le Thanh Duong <olivier@lethanh.be>
40
Date: 2010-03-31 01:05:24 +0200
42
Messages: correct stylistic comments from review
44
commit 1bf636da4f710d8fb47266f1e572a5ddfe17c52b
45
Author: Olivier Le Thanh Duong <olivier@lethanh.be>
46
Date: 2010-03-29 04:07:35 +0200
48
Implement the Messages interface (fd.o #27201)
50
commit e5beb9eeffe4da9b3f6c546595e633f98c0624b4
51
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
52
Date: 2010-04-02 17:50:02 +0100
56
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
58
commit 62b821c90c461a5ab441bf66ad9fb35741a213a9
59
Merge: d5134bc 07bd347
60
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
61
Date: 2010-04-02 17:48:43 +0100
63
Merge remote branch 'wjt/fd.o-27325-GetContactAttributes-tolerance'
65
commit d5134bc148c46c0a78721c656af40121780ead83
66
Merge: fbbb71a 84821ee
67
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
68
Date: 2010-03-31 12:08:40 +0100
70
Merge branch 'chat-to-non-contact'
72
commit 84821ee05eb76a1979140a9316df55863871882a
73
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
74
Date: 2010-03-17 02:23:53 +0000
76
im/conference channel: raise NotAvailable when started with an invalid contact
78
If you create a text channel with TargetID="ajksdad" then it'll work
79
because butterfly just thinks the contact is offline. If there is no
80
contact available from looking in the addressbook, then we won't even
81
be able to send offline messages, so fail when creating the channel.
83
Ditto for the conference channel when specifying initial invitees.
87
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
89
commit 07bd347f89195f357f69622b8d02239f663a1a3d
90
Author: Will Thompson <will.thompson@collabora.co.uk>
91
Date: 2010-03-26 11:54:53 +0000
93
Make GetContactAttributes() more tolerant.
95
See http://bugs.freedesktop.org/show_bug.cgi?id=27325
97
commit fbbb71a170876d87358a84c06011d76bc8b0d960
98
Merge: 478a169 89ac716
99
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
100
Date: 2010-03-30 15:51:56 +0100
102
Merge branch 'contactcaps'
104
commit 478a16906b4cb3fd1c870a9bf5161e84865d10c9
105
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
106
Date: 2010-03-22 01:19:04 +0000
108
Start 0.5.8 development.
110
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
1
112
commit 71a8717f201cfd5ca343671f1b24cc9c6fa2e686
2
113
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
3
114
Date: 2010-03-22 01:12:58 +0000
35
146
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
148
commit 89ac7165248cd95e0e15084bbaaeb7bbeab7d9d0
149
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
150
Date: 2010-03-17 21:43:39 +0000
152
contacts: add ContactCapabilities contact attributes
154
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
156
commit 7fc26614724831e83b0f389bd683c8fa83ba19b8
157
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
158
Date: 2010-03-17 21:43:28 +0000
160
capabilities: implement ContactCapabilities
162
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
37
164
commit 665bc341c44741e452197f7da7c1092cb79c7bb5
38
165
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
39
166
Date: 2010-03-17 12:58:16 +0000