← Back to branch summary

~om26er/ubuntu/maverick/papyon/papyon-fix2-665526

« back to all changes in this revision

Viewing changes to papyon/client.py

  • Committer: Ken VanDine
  • Date: 2010-09-14 20:39:57 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: ken.vandine@canonical.com-20100914203957-1hriss4zo8rr11hr
Tags: 0.5.1-0ubuntu1
releasing version 0.5.1-0ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
papyon/client.py
87
87
import papyon.service.AddressBook as AB
88
88
import papyon.service.OfflineIM as OIM
89
89
import papyon.service.Spaces as Spaces
 
90
import papyon.service.ContentRoaming as CR
90
91
 
91
92
from papyon.util.decorator import rw_property
92
93
from papyon.transport import *
93
94
from papyon.switchboard_manager import SwitchboardManager
94
95
from papyon.media import RTCActivityManager
95
96
from papyon.msnp2p import P2PSessionManager
 
97
from papyon.msnp2p.transport.switchboard import SwitchboardP2PTransport
96
98
from papyon.p2p import MSNObjectStore, FileTransferManager, WebcamHandler
97
99
from papyon.sip import SIPCallManager
98
100
from papyon.conversation import SwitchboardConversation, \
163
165
        self._address_book = None
164
166
        self._oim_box = None
165
167
        self._mailbox = None
 
168
        self._roaming = None
166
169
 
167
170
        self.__die = False
168
171
        self.__connect_transport_signals()
202
205
        return self._call_manager
203
206
 
204
207
    @property
 
208
    def content_roaming(self):
 
209
        return self._roaming
 
210
 
 
211
    @property
205
212
    def ft_manager(self):
206
213
        """The files transfer manager
207
214
            @type: L{FileTransferManager<papyon.p2p.FileTransferManager>}"""
384
391
            self._oim_box = OIM.OfflineMessagesBox(self._sso, self, self._proxies)
385
392
            self.__connect_oim_box_signals()
386
393
            self._spaces = Spaces.Spaces(self._sso, self._proxies)
 
394
            self._roaming = CR.ContentRoaming(self._sso, self._address_book, self._proxies)
387
395
 
388
396
            self._state = ClientState.CONNECTED
389
397
 
460
468
            if handler_class is SwitchboardConversation:
461
469
                if self._dispatch("on_invite_conversation", handler) == 0:
462
470
                    logger.warning("No event handler attached for conversations")
 
471
            elif handler_class in [SwitchboardP2PTransport]:
 
472
                pass
463
473
            else:
464
474
                logger.warning("Unknown Switchboard Handler class %s" % handler_class)
465
475