diff -Nru telepathy-butterfly-0.5.8/butterfly/aliasing.py telepathy-butterfly-0.5.9/butterfly/aliasing.py --- telepathy-butterfly-0.5.8/butterfly/aliasing.py 2009-09-18 11:52:02.000000000 +0200 +++ telepathy-butterfly-0.5.9/butterfly/aliasing.py 2010-04-20 19:00:58.000000000 +0200 @@ -18,6 +18,7 @@ import logging +import dbus import telepathy import telepathy.constants import papyon @@ -49,7 +50,7 @@ def GetAliases(self, contacts): logger.debug("Called GetAliases") - result = {} + result = dbus.Dictionary(signature='us') for contact in contacts: result[contact] = self._get_alias(contact) return result diff -Nru telepathy-butterfly-0.5.8/butterfly/avatars.py telepathy-butterfly-0.5.9/butterfly/avatars.py --- telepathy-butterfly-0.5.8/butterfly/avatars.py 2009-09-18 11:52:02.000000000 +0200 +++ telepathy-butterfly-0.5.9/butterfly/avatars.py 2010-04-22 20:43:20.000000000 +0200 @@ -33,6 +33,12 @@ logger = logging.getLogger('Butterfly.Avatars') +SUPPORTED_AVATAR_MIME_TYPES = dbus.Array(["image/png", "image/jpeg", + "image/gif"], signature='s') +MINIMUM_AVATAR_PIXELS = dbus.UInt32(96) +RECOMMENDED_AVATAR_PIXELS = dbus.UInt32(96) +MAXIMUM_AVATAR_PIXELS = dbus.UInt32(192) +MAXIMUM_AVATAR_BYTES = dbus.UInt32(500 * 1024) class ButterflyAvatars(\ telepathy.server.ConnectionInterfaceAvatars, @@ -45,9 +51,24 @@ papyon.event.ContactEventInterface.__init__(self, self.msn_client) papyon.event.ProfileEventInterface.__init__(self, self.msn_client) + dbus_interface = telepathy.CONNECTION_INTERFACE_AVATARS + self._implement_property_get(dbus_interface, { + 'SupportedAvatarMIMETypes': + lambda: SUPPORTED_AVATAR_MIME_TYPES, + 'MinimumAvatarHeight': lambda: MINIMUM_AVATAR_PIXELS, + 'MinimumAvatarWidth': lambda: MINIMUM_AVATAR_PIXELS, + 'RecommendedAvatarHeight': lambda: RECOMMENDED_AVATAR_PIXELS, + 'RecommendedAvatarWidth': lambda: RECOMMENDED_AVATAR_PIXELS, + 'MaximumAvatarHeight': lambda: MAXIMUM_AVATAR_PIXELS, + 'MaximumAvatarWidth': lambda: MAXIMUM_AVATAR_PIXELS, + 'MaximumAvatarBytes': lambda: MAXIMUM_AVATAR_BYTES, + }) + def GetAvatarRequirements(self): - mime_types = ("image/png","image/jpeg","image/gif") - return (mime_types, 96, 96, 192, 192, 500 * 1024) + return (SUPPORTED_AVATAR_MIME_TYPES, + MINIMUM_AVATAR_PIXELS, MINIMUM_AVATAR_PIXELS, + MAXIMUM_AVATAR_PIXELS, MAXIMUM_AVATAR_PIXELS, + MAXIMUM_AVATAR_BYTES) def GetKnownAvatarTokens(self, contacts): result = {} diff -Nru telepathy-butterfly-0.5.8/butterfly/capabilities.py telepathy-butterfly-0.5.9/butterfly/capabilities.py --- telepathy-butterfly-0.5.8/butterfly/capabilities.py 2010-04-08 15:00:08.000000000 +0200 +++ telepathy-butterfly-0.5.9/butterfly/capabilities.py 2010-04-22 20:39:41.000000000 +0200 @@ -101,7 +101,7 @@ return ret def UpdateCapabilities(self, caps): - if self._state != telepathy.CONNECTION_STATUS_CONNECTED: + if self._status != telepathy.CONNECTION_STATUS_CONNECTED: self._update_capabilities_calls.append(caps) return @@ -150,7 +150,7 @@ """When we add a contact in our contact list, add the capabilities to create text channel to the contact""" if contact.is_member(papyon.Membership.FORWARD): - handle = ButterflyHandleFactory(self._conn_ref(), 'contact', + handle = ButterflyHandleFactory(self, 'contact', contact.account, contact.network_id) self.add_text_capabilities([handle]) @@ -160,7 +160,7 @@ cc_ret = dbus.Dictionary({}, signature='ua(a{sv}as)') for handle in contacts_handles: ctype = telepathy.CHANNEL_TYPE_TEXT - if handle in self._caps: + if handle in self._caps and ctype in self._caps[handle]: old_gen, old_spec = self._caps[handle][ctype] else: old_gen = 0 diff -Nru telepathy-butterfly-0.5.8/butterfly/channel_manager.py telepathy-butterfly-0.5.9/butterfly/channel_manager.py --- telepathy-butterfly-0.5.8/butterfly/channel_manager.py 2010-03-30 16:58:54.000000000 +0200 +++ telepathy-butterfly-0.5.9/butterfly/channel_manager.py 2010-04-19 15:31:56.000000000 +0200 @@ -114,15 +114,15 @@ ] self.implement_channel_classes(telepathy.CHANNEL_TYPE_CONTACT_LIST, self._get_list_channel, classes) - classes = [ - ({telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_STREAMED_MEDIA, - telepathy.CHANNEL_INTERFACE + '.TargetHandleType': dbus.UInt32(telepathy.HANDLE_TYPE_CONTACT)}, - [telepathy.CHANNEL_INTERFACE + '.TargetHandle', - telepathy.CHANNEL_INTERFACE + '.TargetID', - telepathy.CHANNEL_TYPE_STREAMED_MEDIA + '.InitialAudio', - telepathy.CHANNEL_TYPE_STREAMED_MEDIA + '.InitialVideo']) - ] - self.implement_channel_classes(telepathy.CHANNEL_TYPE_STREAMED_MEDIA, self._get_media_channel, classes) +# classes = [ +# ({telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_STREAMED_MEDIA, +# telepathy.CHANNEL_INTERFACE + '.TargetHandleType': dbus.UInt32(telepathy.HANDLE_TYPE_CONTACT)}, +# [telepathy.CHANNEL_INTERFACE + '.TargetHandle', +# telepathy.CHANNEL_INTERFACE + '.TargetID', +# telepathy.CHANNEL_TYPE_STREAMED_MEDIA + '.InitialAudio', +# telepathy.CHANNEL_TYPE_STREAMED_MEDIA + '.InitialVideo']) +# ] +# self.implement_channel_classes(telepathy.CHANNEL_TYPE_STREAMED_MEDIA, self._get_media_channel, classes) def _get_list_channel(self, props): _, surpress_handler, handle = self._get_type_requested_handle(props) diff -Nru telepathy-butterfly-0.5.8/butterfly/connection.py telepathy-butterfly-0.5.9/butterfly/connection.py --- telepathy-butterfly-0.5.8/butterfly/connection.py 2010-04-08 15:01:31.000000000 +0200 +++ telepathy-butterfly-0.5.9/butterfly/connection.py 2010-04-19 15:32:05.000000000 +0200 @@ -95,6 +95,14 @@ if proxy is not None: self._proxies['https'] = proxy + self._suggested_proxies = [] + + # If the HTTP proxy parameters have been set, don't try any + # others proxies automatically. + if 'http' not in self._proxies: + self._fill_suggested_proxies() + self._use_next_proxy() + self._manager = weakref.proxy(manager) self._new_client(use_http=parameters['http-method']) self._account = (parameters['account'].encode('utf-8'), @@ -117,8 +125,6 @@ self._initial_presence = papyon.Presence.INVISIBLE self._initial_personal_message = None - self._manager.connected(self) - logger.info("Connection to the account %s created" % account) except Exception, e: import traceback @@ -142,6 +148,67 @@ papyon.event.InviteEventInterface.__init__(self, self._msn_client) papyon.event.OfflineMessagesEventInterface.__init__(self, self._msn_client) + def _fill_suggested_proxies(self): + try: + import libproxy + except ImportError: + return + + factory = libproxy.ProxyFactory() + proxies = factory.getProxies('http://gateway.messenger.msn.com/') + + # Remove socks proxies that papyon doesn't support. + proxies = [p for p in proxies if p.startswith('http://') or p == 'direct://'] + + if proxies: + self._suggested_proxies = proxies + + def _use_next_proxy(self): + if not self._suggested_proxies: + return False + + # Use the first one. + proxy = self._suggested_proxies.pop(0) + + if proxy == 'direct://': + if 'http' in self._proxies: + del self._proxies['http'] + return True + + # libproxy documentation states: + # + # * The format of the returned proxy strings are as follows: + # * - http://[username:password@]proxy:port + # * - socks://[username:password@]proxy:port + # * - direct:// + # etc. + # + # We've already removed every proxy other than http and + # direct, and have dealt with direct, so any other element + # will be an HTTP proxy: + + proxy = proxy[len('http://'):] + + # Get username and password out. + if '@' in proxy: + auth, proxy = proxy.split('@') + user, password = auth.split(':') + else: + user = password = None + + server, port = proxy.split(':') + + self._proxies['http'] = \ + papyon.ProxyInfos(host=server, port=int(port), type='http', + user=user, password=password) + + if user: + logger.info('Using proxy: http://%s:***@%s:%u' % (user, server, int(port))) + else: + logger.info('Using proxy: http://%s:%u' % (server, int(port))) + + return True + @property def manager(self): return self._manager @@ -307,8 +374,11 @@ # papyon.event.ClientEventInterface def on_client_error(self, type, error): if type == papyon.event.ClientErrorType.NETWORK: - if self._tried_http is False: - logger.info("Failed to connect directly, trying HTTP") + # Only move onto the next proxy if we've not already tried HTTP. + if self._tried_http is False or \ + (self._tried_http is True and self._use_next_proxy()): + logger.info("Failed to connect, trying HTTP " + "(possibly again with another proxy)") self._new_client(use_http=True) self._msn_client.login(*self._account) else: @@ -393,7 +463,7 @@ self._manager.disconnected(self) -def build_proxy_infos(self, parameters, proxy_type='http'): +def build_proxy_infos(parameters, proxy_type='http'): server_key = proxy_type + '-proxy-server' port_key = proxy_type + '-proxy-port' username_key = proxy_type + '-proxy-username' diff -Nru telepathy-butterfly-0.5.8/butterfly/contacts.py telepathy-butterfly-0.5.9/butterfly/contacts.py --- telepathy-butterfly-0.5.8/butterfly/contacts.py 2010-04-08 15:00:08.000000000 +0200 +++ telepathy-butterfly-0.5.9/butterfly/contacts.py 2010-04-20 19:00:58.000000000 +0200 @@ -66,9 +66,9 @@ logger.debug("Ignoring unsupported interface %s" % interface) handle_type = telepathy.HANDLE_TYPE_CONTACT - ret = {} + ret = dbus.Dictionary(signature='ua{sv}') for handle in handles: - ret[handle] = {} + ret[handle] = dbus.Dictionary(signature='sv') functions = { telepathy.CONNECTION : diff -Nru telepathy-butterfly-0.5.8/butterfly/presence.py telepathy-butterfly-0.5.9/butterfly/presence.py --- telepathy-butterfly-0.5.8/butterfly/presence.py 2010-03-17 01:55:26.000000000 +0100 +++ telepathy-butterfly-0.5.9/butterfly/presence.py 2010-04-20 19:00:58.000000000 +0200 @@ -72,15 +72,15 @@ } to_presence_type = { - ONLINE: telepathy.constants.CONNECTION_PRESENCE_TYPE_AVAILABLE, - AWAY: telepathy.constants.CONNECTION_PRESENCE_TYPE_AWAY, - BUSY: telepathy.constants.CONNECTION_PRESENCE_TYPE_BUSY, - IDLE: telepathy.constants.CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY, - BRB: telepathy.constants.CONNECTION_PRESENCE_TYPE_AWAY, - PHONE: telepathy.constants.CONNECTION_PRESENCE_TYPE_BUSY, - LUNCH: telepathy.constants.CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY, - INVISIBLE: telepathy.constants.CONNECTION_PRESENCE_TYPE_HIDDEN, - OFFLINE: telepathy.constants.CONNECTION_PRESENCE_TYPE_OFFLINE + ONLINE: dbus.UInt32(telepathy.constants.CONNECTION_PRESENCE_TYPE_AVAILABLE), + AWAY: dbus.UInt32(telepathy.constants.CONNECTION_PRESENCE_TYPE_AWAY), + BUSY: dbus.UInt32(telepathy.constants.CONNECTION_PRESENCE_TYPE_BUSY), + IDLE: dbus.UInt32(telepathy.constants.CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY), + BRB: dbus.UInt32(telepathy.constants.CONNECTION_PRESENCE_TYPE_AWAY), + PHONE: dbus.UInt32(telepathy.constants.CONNECTION_PRESENCE_TYPE_BUSY), + LUNCH: dbus.UInt32(telepathy.constants.CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY), + INVISIBLE: dbus.UInt32(telepathy.constants.CONNECTION_PRESENCE_TYPE_HIDDEN), + OFFLINE: dbus.UInt32(telepathy.constants.CONNECTION_PRESENCE_TYPE_OFFLINE) } class ButterflyPresence(telepathy.server.ConnectionInterfacePresence, @@ -213,7 +213,7 @@ self.msn_client.profile.presence = presence def get_simple_presences(self, contacts): - presences = {} + presences = dbus.Dictionary(signature='u(uss)') for handle_id in contacts: handle = self.handle(telepathy.HANDLE_TYPE_CONTACT, handle_id) try: @@ -230,7 +230,8 @@ presence_type = ButterflyPresenceMapping.to_presence_type[presence] - presences[handle] = (presence_type, presence, personal_message) + presences[handle] = dbus.Struct((presence_type, presence, + personal_message), signature='uss') return presences def get_statuses(self): diff -Nru telepathy-butterfly-0.5.8/ChangeLog telepathy-butterfly-0.5.9/ChangeLog --- telepathy-butterfly-0.5.8/ChangeLog 2010-04-08 15:13:42.000000000 +0200 +++ telepathy-butterfly-0.5.9/ChangeLog 2010-04-24 13:34:41.000000000 +0200 @@ -1,3 +1,136 @@ +commit edff4cebf8dba3e55a99f0f9d34231a4c6f05f8a +Author: Jonny Lamb +Date: 2010-04-24 12:34:06 +0100 + + Version 0.5.9. + + Signed-off-by: Jonny Lamb + +commit 2108ba96231e0084ccd6398c98642f5fa9aaa828 +Author: Jonny Lamb +Date: 2010-04-22 19:41:19 +0100 + + NEWS: updated + + Signed-off-by: Jonny Lamb + +commit a7a69dc16a13d775698093b50baf7fe535b80b35 +Merge: 24f2873 1dccdf7 +Author: Simon McVittie +Date: 2010-04-22 13:18:34 +0100 + + Merge branch 'avatar-reqs' + + Reviewed-by: Jonny Lamb + +commit 1dccdf7d3576175f922467ffd4bf17f56f0cf9b2 +Author: Simon McVittie +Date: 2010-04-21 18:11:06 +0100 + + fd.o #27776: Avatars: implement the properties from spec 0.17.22 + + The recommended height/width are set to the minimum (96) based on a quick + web search for the canonical sizes. Anyone who uses the official MSN + client and knows how big its avatars are is welcome to change them. + +commit 24f28734e7587674356559663736636d10b362c3 +Author: Simon McVittie +Date: 2010-04-20 17:53:18 +0100 + + Be explicit about data types in methods that produce contact attributes + + Previously, the wrong type was returned for SimplePresence/presence. + Until telepathy-glib 0.11.3, this was masked by the fact that TpContact + would respond to missing or wrongly-typed information in the result of + GetContactAttributes by falling back to a slower path. This is no longer + done, meaning that all Butterfly contacts appear to have UNKNOWN presence. + + Reviewed-by: Olivier Le Thanh Duong + +commit 825fc60d2476b7e0abfad7f86c8823c2a292e7e3 +Author: Jonny Lamb +Date: 2010-04-19 14:32:05 +0100 + + Revert "connection: register the new connection with the CM so it fires NewConnection" + + This reverts commit 485e9596386bbb16d5d0d9354d6b950686c008c3. Turns + out telepathy.server.ConnectionManager already calls connected in + RequestConnection, and NewConnection is now being fired twice. Oops! + + Signed-off-by: Jonny Lamb + +commit 2f27c8aa1fcf6d68c9f29348a978bcf890bb2fbb +Author: Jonny Lamb +Date: 2010-04-16 12:20:41 +0100 + + channel manager: stop adding StreamedMedia to RequestableChannelClasses + + Fixes fd.o#27689 + + Signed-off-by: Jonny Lamb + +commit 57f4f6f82aeaba15e5fafea1b854d16f4de0b1ea +Author: Jonny Lamb +Date: 2010-04-12 15:04:36 +0100 + + capabilities: fix typo + + Signed-off-by: Jonny Lamb + +commit 568bbfd74d44c28648b5522d9880cdb5792294e0 +Author: Jonny Lamb +Date: 2010-04-09 19:21:46 +0100 + + NEWS: update + + Signed-off-by: Jonny Lamb + +commit 9c1bac1a8c34e3a277d80c316e72eef9bf67f742 +Author: Jonny Lamb +Date: 2010-04-09 16:15:56 +0100 + + capabilities: fix typo + + ButterflyCapabilities is a class which ButterflyConnection inherits + from, so self *is* the connection. + + Fixes fd.o#27559 + + Signed-off-by: Jonny Lamb + +commit d173a535bbf07e0c97325fd01fa4ab1ad2299281 +Author: Jonny Lamb +Date: 2010-04-09 16:06:48 +0100 + + capabilities: handle the case when handle capabilities are not yet present for text channels + + Fixes fd.o#27555 + + Signed-off-by: Jonny Lamb + +commit 3abc79447d1ebd3a2ea805c13af18b2b3b3c64bd +Author: Jonny Lamb +Date: 2010-04-08 21:31:37 +0100 + + NEWS: update + + Signed-off-by: Jonny Lamb + +commit 78561f164a323836a0b01808d1e6baad2ab180f6 +Merge: 2cb906e 736fb20 +Author: Jonny Lamb +Date: 2010-04-08 21:24:46 +0100 + + Merge branch 'proxies' + +commit 2cb906efe9e03a860455ab9c5f1b9132d644f68a +Author: Jonny Lamb +Date: 2010-04-08 14:25:22 +0100 + + Start 0.5.9 development. + + Signed-off-by: Jonny Lamb + commit a9187b5e59f9bc14d8a9425f5610626bd9a2558c Author: Jonny Lamb Date: 2010-04-08 14:07:48 +0100 @@ -23,6 +156,14 @@ Signed-off-by: Jonny Lamb +commit 736fb204bff174c21616ebb899fb8eaa144d1455 +Author: Jonny Lamb +Date: 2010-04-07 18:07:28 +0100 + + connection: only remove the HTTP proxy from the dict if one exists + + Signed-off-by: Jonny Lamb + commit 7e62e6de36f316e43d67355d2dacd71c1691597a Author: Olivier Le Thanh Duong Date: 2010-04-05 13:30:44 +0200 @@ -47,6 +188,14 @@ Implement the Messages interface (fd.o #27201) +commit 0a2243f54a2bab1b13c54c5527970fd49118288f +Author: Jonny Lamb +Date: 2010-04-06 19:24:27 +0100 + + proxies: only consider direct:// and http:// proxies + + Signed-off-by: Jonny Lamb + commit e5beb9eeffe4da9b3f6c546595e633f98c0624b4 Author: Jonny Lamb Date: 2010-04-02 17:50:02 +0100 @@ -62,6 +211,14 @@ Merge remote branch 'wjt/fd.o-27325-GetContactAttributes-tolerance' +commit baa590f80ecdcb54f9db9490be8fa7c5132201f4 +Author: Jonny Lamb +Date: 2010-03-17 02:16:14 +0000 + + connection: use libproxy if available to autofill proxy list + + Signed-off-by: Jonny Lamb + commit d5134bc148c46c0a78721c656af40121780ead83 Merge: fbbb71a 84821ee Author: Jonny Lamb @@ -187,6 +344,17 @@ Signed-off-by: Jonny Lamb +commit 410290139bae4db97bf4aa42dec5a9255405d923 +Author: Jonny Lamb +Date: 2010-03-17 01:12:39 +0000 + + connection: fix build_proxy_infos' args + + This bug prevented proxy support from ever having worked, and due to + proxy_type having a default value, it was hidden! + + Signed-off-by: Jonny Lamb + commit 6559379d29603d1384bce75ea3d35df6698ace51 Author: Jonny Lamb Date: 2010-03-15 17:00:31 +0000 diff -Nru telepathy-butterfly-0.5.8/configure telepathy-butterfly-0.5.9/configure --- telepathy-butterfly-0.5.8/configure 2010-04-08 15:13:31.000000000 +0200 +++ telepathy-butterfly-0.5.9/configure 2010-04-24 13:34:31.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for telepathy-butterfly 0.5.8. +# Generated by GNU Autoconf 2.65 for telepathy-butterfly 0.5.9. # # Report bugs to . # @@ -552,8 +552,8 @@ # Identity of this package. PACKAGE_NAME='telepathy-butterfly' PACKAGE_TARNAME='telepathy-butterfly' -PACKAGE_VERSION='0.5.8' -PACKAGE_STRING='telepathy-butterfly 0.5.8' +PACKAGE_VERSION='0.5.9' +PACKAGE_STRING='telepathy-butterfly 0.5.9' PACKAGE_BUGREPORT='http://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=butterfly' PACKAGE_URL='' @@ -1180,7 +1180,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures telepathy-butterfly 0.5.8 to adapt to many kinds of systems. +\`configure' configures telepathy-butterfly 0.5.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1247,7 +1247,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of telepathy-butterfly 0.5.8:";; + short | recursive ) echo "Configuration of telepathy-butterfly 0.5.9:";; esac cat <<\_ACEOF @@ -1321,7 +1321,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -telepathy-butterfly configure 0.5.8 +telepathy-butterfly configure 0.5.9 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1338,7 +1338,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by telepathy-butterfly $as_me 0.5.8, which was +It was created by telepathy-butterfly $as_me 0.5.9, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2146,7 +2146,7 @@ # Define the identity of the package. PACKAGE='telepathy-butterfly' - VERSION='0.5.8' + VERSION='0.5.9' cat >>confdefs.h <<_ACEOF @@ -2971,7 +2971,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by telepathy-butterfly $as_me 0.5.8, which was +This file was extended by telepathy-butterfly $as_me 0.5.9, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3024,7 +3024,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -telepathy-butterfly config.status 0.5.8 +telepathy-butterfly config.status 0.5.9 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -Nru telepathy-butterfly-0.5.8/configure.ac telepathy-butterfly-0.5.9/configure.ac --- telepathy-butterfly-0.5.8/configure.ac 2010-04-08 15:07:17.000000000 +0200 +++ telepathy-butterfly-0.5.9/configure.ac 2010-04-24 13:33:49.000000000 +0200 @@ -6,7 +6,7 @@ dnl The telepathy-python version number (must actually be numeric at the moment) m4_define(telepathy_butterfly_major_version, 0) m4_define(telepathy_butterfly_minor_version, 5) -m4_define(telepathy_butterfly_micro_version, 8) +m4_define(telepathy_butterfly_micro_version, 9) m4_define(telepathy_butterfly_maybe_datestamp, m4_esyscmd([if test x]telepathy_butterfly_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) diff -Nru telepathy-butterfly-0.5.8/debian/changelog telepathy-butterfly-0.5.9/debian/changelog --- telepathy-butterfly-0.5.8/debian/changelog 2010-05-19 22:14:14.000000000 +0200 +++ telepathy-butterfly-0.5.9/debian/changelog 2010-05-19 22:14:14.000000000 +0200 @@ -1,3 +1,25 @@ +telepathy-butterfly (0.5.9-0ubuntu1) lucid-proposed; urgency=low + + * New upstream version: + Enhancements: + * libproxy can now be used to automatically retrieve proxy settings + and give these settings to papyon.(lp: #579281) + Fixes: + * fd.o#27555: butterfly crashed with KeyError in add_text_capabilities(). + * fd.o#27559: butterfly crashed with AttributeError in + on_addressbook_contact_added(). + * fd.o #27776: Avatars: implement the properties from spec 0.17.22. + Dependencies: + * Not a hard dependency, but python-libproxy is required if you want + automatic proxy configuration to work. See the above note about + python-libproxy versions. + * debian/patches/git_capabilities_bugfixes.patch: + - the change is in the new version + * debian/control: + - telepathy-butterfly suggests python-libproxy + + -- Sebastien Bacher Wed, 19 May 2010 19:48:27 +0200 + telepathy-butterfly (0.5.8-1ubuntu1) lucid; urgency=low * debian/patches/git_capabilities_bugfixes.patch: diff -Nru telepathy-butterfly-0.5.8/debian/control telepathy-butterfly-0.5.9/debian/control --- telepathy-butterfly-0.5.8/debian/control 2010-05-19 22:14:14.000000000 +0200 +++ telepathy-butterfly-0.5.9/debian/control 2010-05-19 22:14:14.000000000 +0200 @@ -20,6 +20,7 @@ Depends: ${misc:Depends}, ${python:Depends}, python-dbus, python-gobject, python-telepathy (>= 0.15.17), python-papyon (>= 0.4.2) Conflicts: empathy (<< 2.30) XB-Python-Version: ${python:Versions} +Suggests: python-libproxy (>= 0.3.1) Provides: telepathy-connection-manager Description: MSN connection manager for Telepathy MSN connection manager for telepathy that handles presence, personal diff -Nru telepathy-butterfly-0.5.8/debian/patches/git_capabilities_bugfixes.patch telepathy-butterfly-0.5.9/debian/patches/git_capabilities_bugfixes.patch --- telepathy-butterfly-0.5.8/debian/patches/git_capabilities_bugfixes.patch 2010-05-19 22:14:14.000000000 +0200 +++ telepathy-butterfly-0.5.9/debian/patches/git_capabilities_bugfixes.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ ---- telepathy-butterfly-0.5.8/butterfly/capabilities.py 2010-04-08 15:00:08.000000000 +0200 -+++ telepathy-butterfly/butterfly/capabilities.py 2010-04-12 19:05:37.000000000 +0200 -@@ -101,7 +101,7 @@ - return ret - - def UpdateCapabilities(self, caps): -- if self._state != telepathy.CONNECTION_STATUS_CONNECTED: -+ if self._status != telepathy.CONNECTION_STATUS_CONNECTED: - self._update_capabilities_calls.append(caps) - return - -@@ -150,7 +150,7 @@ - """When we add a contact in our contact list, add the - capabilities to create text channel to the contact""" - if contact.is_member(papyon.Membership.FORWARD): -- handle = ButterflyHandleFactory(self._conn_ref(), 'contact', -+ handle = ButterflyHandleFactory(self, 'contact', - contact.account, contact.network_id) - self.add_text_capabilities([handle]) - -@@ -160,7 +160,7 @@ - cc_ret = dbus.Dictionary({}, signature='ua(a{sv}as)') - for handle in contacts_handles: - ctype = telepathy.CHANNEL_TYPE_TEXT -- if handle in self._caps: -+ if handle in self._caps and ctype in self._caps[handle]: - old_gen, old_spec = self._caps[handle][ctype] - else: - old_gen = 0 diff -Nru telepathy-butterfly-0.5.8/NEWS telepathy-butterfly-0.5.9/NEWS --- telepathy-butterfly-0.5.8/NEWS 2010-04-08 15:06:45.000000000 +0200 +++ telepathy-butterfly-0.5.9/NEWS 2010-04-24 13:33:32.000000000 +0200 @@ -1,3 +1,29 @@ +telepathy-butterfly-0.5.9 (2010-04-24) +====================================== + +Enhancements: + + * libproxy can now be used to automatically retrieve proxy settings + and give these settings to papyon. NOTE: the version of + python-libproxy in Ubuntu (0.2.3) has a bug which makes butterfly + segfault -- version 0.3.1 is known to work. (fd.o#27121) + +Fixes: + + * fd.o#27555: butterfly crashed with KeyError in + add_text_capabilities(). + + * fd.o#27559: butterfly crashed with AttributeError in + on_addressbook_contact_added(). + + * fd.o #27776: Avatars: implement the properties from spec 0.17.22. + +Dependencies: + + * Not a hard dependency, but python-libproxy is required if you want + automatic proxy configuration to work. See the above note about + python-libproxy versions. + telepathy-butterfly-0.5.8 (2010-04-08) ======================================