← Back to branch summary

~ubuntu-branches/ubuntu/lucid/telepathy-butterfly/lucid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/002_git_change_fix_msn_hidden_status.patch

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine
  • Date: 2009-10-20 10:33:53 UTC
  • mfrom: (1.1.10 upstream) (8.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20091020103353-3fxta9vmps4hjiqw
Tags: 0.5.2-0ubuntu1
https://launchpad.net/bugs/437828
* New upstream release (LP: #437828)
  - offline messages no longer get lost
* debian/patches/001_lp410376_python_syntax.patch
  - Updated to apply to 0.5.2
* debian/patches/002_disable_a-v_support.patch
  - Updated to apply to 0.5.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/002_git_change_fix_msn_hidden_status.patch
1
 
Subject: Fixed signature of Statuses property (SimplePresence interface)
2
 
X-Git-Tag: telepathy-butterfly-0.5.1~4
3
 
X-Git-Url: http://git.collabora.co.uk/?p=telepathy-butterfly.git;a=commitdiff_plain;h=21fac708ea2ac6a76df77921cc252cad7521a500
4
 
 
5
 
Fixed signature of Statuses property (SimplePresence interface)
6
 
---
7
 
 
8
 
diff --git a/butterfly/presence.py b/butterfly/presence.py
9
 
index d072d2a..302fe4f 100644
10
 
--- a/butterfly/presence.py
11
 
+++ b/butterfly/presence.py
12
 
@@ -22,6 +22,7 @@
13
 
 import logging
14
 
 import time
15
 
 
16
 
+import dbus
17
 
 import telepathy
18
 
 import telepathy.constants
19
 
 import telepathy.errors
20
 
@@ -235,7 +236,7 @@ class ButterflyPresence(telepathy.server.ConnectionInterfacePresence,
21
 
     def get_statuses(self):
22
 
         # you get one of these for each status
23
 
         # {name:(Type, May_Set_On_Self, Can_Have_Message}
24
 
-        return {
25
 
+        return dbus.Dictionary({
26
 
             ButterflyPresenceMapping.ONLINE:(
27
 
                 telepathy.CONNECTION_PRESENCE_TYPE_AVAILABLE,
28
 
                 True, True),
29
 
@@ -263,7 +264,7 @@ class ButterflyPresence(telepathy.server.ConnectionInterfacePresence,
30
 
             ButterflyPresenceMapping.OFFLINE:(
31
 
                 telepathy.CONNECTION_PRESENCE_TYPE_OFFLINE,
32
 
                 True, False)
33
 
-        }
34
 
+        }, signature='s(ubb)')
35
 
 
36
 
     # papyon.event.ContactEventInterface
37
 
     def on_contact_presence_changed(self, contact):
38