← Back to branch summary

~ubuntu-branches/ubuntu/precise/telepathy-glib/precise

« back to all changes in this revision

Viewing changes to ChangeLog

  • Committer: Bazaar Package Importer
  • Author(s): Adam Conrad
  • Date: 2011-06-22 16:29:01 UTC
  • mfrom: (1.6.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20110622162901-tc492ifcn229lmkh
Tags: 0.15.2-2
Cherry-pick upstream fix to increase timeout of the contact-lists
test on slower architectures like armel, mips, and mipsel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ChangeLog
 
1
commit af36f7b4f00996c95596dd26daecd4ae591ad3c2
 
2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
3
Date:   2011-06-21 16:53:49 +0200
 
4
 
 
5
    prepare 0.15.2
 
6
 
 
7
commit 78083d60a23441715841503dd2595a33f6bb1efc
 
8
Merge: 820f865 23ce54c
 
9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
10
Date:   2011-06-21 16:37:23 +0200
 
11
 
 
12
    Merge branch 'telepathy-glib-0.14' into release
 
13
    
 
14
    Conflicts:
 
15
        NEWS
 
16
        configure.ac
 
17
 
 
18
commit 23ce54c347cc8c99e70a6ef2938a84de1a5a97ee
 
19
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
20
Date:   2011-06-21 16:32:57 +0200
 
21
 
 
22
    set nano flag
 
23
 
 
24
commit bff9e130d0f365c61f125424263981cf12f6b779
 
25
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
26
Date:   2011-06-21 16:19:01 +0200
 
27
 
 
28
    prepare 0.14.8
 
29
 
 
30
commit 820f8650b7cb8c2b0c74d3e922ff62ea3bb0a5f8
 
31
Merge: 66db4d7 d50e2a5
 
32
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
33
Date:   2011-06-21 16:10:05 +0200
 
34
 
 
35
    Merge branch 'telepathy-glib-0.14'
 
36
 
 
37
commit d50e2a51e92c2f3c37f7c30d7351c4651da350f9
 
38
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
39
Date:   2011-06-21 15:39:43 +0200
 
40
 
 
41
    channel-iface: set TP_UNKNOWN_HANDLE_TYPE as default handle type
 
42
    
 
43
    TP_HANDLE_TYPE_NONE is not a good default, if we don't know the handle type we
 
44
    shouln't try to guess it.
 
45
    This also confuses TpChannel which think we are setting a valid handle type;
 
46
    see fdo#38524.
 
47
 
 
48
commit 66db4d7e070b6e34072ffdf5d112dd23b458c693
 
49
Merge: e4b624d 32af717
 
50
Author: Will Thompson <will.thompson@collabora.co.uk>
 
51
Date:   2011-06-17 17:08:24 +0100
 
52
 
 
53
    Merge branch 'debug-spam'
 
54
    
 
55
    Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
 
56
 
 
57
commit e4b624d25d7aedb89be4d717ca0ff61721bcde68
 
58
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
59
Date:   2011-06-17 12:18:21 +0100
 
60
 
 
61
    stream-tube-channel.c: add some comments explaining how we use client sockets
 
62
 
 
63
commit ad423a616f2b1600cc406366638290b6357e3975
 
64
Author: Xavier Claessens <xclaesse@gmail.com>
 
65
Date:   2011-06-15 22:38:23 +0200
 
66
 
 
67
    Add missing files to introspection
 
68
 
 
69
commit ae747652aefbbc5169870af41ab6929244001a55
 
70
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
71
Date:   2011-05-25 14:04:33 +0200
 
72
 
 
73
    automatic-proxy-factory: prepare TP_CHANNEL_FEATURE_PASSWORD
 
74
 
 
75
commit fee9c4dc6ba76fe55c9a75369fab46df41321e36
 
76
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
77
Date:   2011-05-25 12:01:47 +0200
 
78
 
 
79
    TpChannel: add high-level API for Password (#37360)
 
80
 
 
81
commit 331e4c192fc1dbd1cbbc03f98b30b878ef332b34
 
82
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
83
Date:   2011-05-25 14:02:11 +0200
 
84
 
 
85
    textchan-group: implement Password
 
86
 
 
87
commit 87c5fb649bec9df2f96f30a3cb56d6dcf5685f7d
 
88
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
89
Date:   2011-05-30 14:53:33 +0200
 
90
 
 
91
    simplify channel_remove_self_cb
 
92
 
 
93
commit 985d78ca9d0eb3947fd35269e6a55e0fecf57526
 
94
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
95
Date:   2011-05-30 14:49:58 +0200
 
96
 
 
97
    simplify channel_destroy_cb
 
98
 
 
99
commit 0866c7eb7b580086cae52618abf8dd16b502e55c
 
100
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
101
Date:   2011-05-30 14:06:27 +0200
 
102
 
 
103
    add tp_channel_dispatch_operation_destroy_channels_async() (fdo #28015)
 
104
 
 
105
commit 37a46435c1e3fb934c11f681f6a50178ffd61d00
 
106
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
107
Date:   2011-05-30 13:55:47 +0200
 
108
 
 
109
    add tp_channel_destroy_async()
 
110
 
 
111
commit db9d23c30197248ef00320e9427493f7f0a02f83
 
112
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
113
Date:   2011-05-27 17:29:01 +0200
 
114
 
 
115
    add tp_channel_dispatch_operation_leave_channels_async (#28015)
 
116
 
 
117
commit 837dafccc57660143bd6ecf780faa7772b174340
 
118
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 
119
Date:   2011-05-30 11:54:17 +0200
 
120
 
 
121
    set nano flag
 
122
 
1
123
commit 108d88b0c472b05a5425b49cab6c7d024010b5d8
2
124
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
3
125
Date:   2011-05-30 11:19:33 +0200
952
1074
    
953
1075
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
954
1076
 
 
1077
commit 32af717f8baa617d7deeb7606cb7301949782ac7
 
1078
Author: Will Thompson <will.thompson@collabora.co.uk>
 
1079
Date:   2011-04-21 17:49:01 +0100
 
1080
 
 
1081
    BaseConnection: reduce debug spam.
 
1082
    
 
1083
    I don't think any of these have ever been of use to me. Including the
 
1084
    address of the object in the debug output once seems fine.
 
1085
    
 
1086
    This shaves another 3% off the Gabble test suite debug output.
 
1087
 
 
1088
commit 2aeaa8fe2dbc967063bcbb6a12535872a49d5fc1
 
1089
Author: Will Thompson <will.thompson@collabora.co.uk>
 
1090
Date:   2011-04-21 17:17:30 +0100
 
1091
 
 
1092
    BaseProtocol: don't debug for unspecified parameters
 
1093
    
 
1094
    If MC didn't specify a value for a connection parameter, then of course
 
1095
    either the default value, or no value, will be used. This change
 
1096
    accounts for over 4% by size of the debug output from running the Gabble
 
1097
    test suite!
 
1098
 
955
1099
commit da80d7883531f427985263f549f42d38aea385a7
956
1100
Merge: 9037339 eefcf8a
957
1101
Author: Will Thompson <will.thompson@collabora.co.uk>