Remove references to obsolete p2p.Stream classes
This commit is contained in:
parent
bc083dae5a
commit
3eeec9bf07
@ -24,13 +24,10 @@ import dbus
|
||||
|
||||
from sugar import env
|
||||
from sugar import profile
|
||||
from sugar.p2p import Stream
|
||||
from sugar.presence import presenceservice
|
||||
from sugar import util
|
||||
from model.Invites import Invites
|
||||
|
||||
PRESENCE_SERVICE_TYPE = "_presence_olpc._tcp"
|
||||
|
||||
class ShellOwner(gobject.GObject):
|
||||
__gtype_name__ = "ShellOwner"
|
||||
|
||||
@ -72,67 +69,13 @@ class ShellOwner(gobject.GObject):
|
||||
|
||||
self._invites = Invites()
|
||||
|
||||
self._last_activity_update = time.time()
|
||||
self._pending_activity_update_timer = None
|
||||
self._pending_activity_update = None
|
||||
self._current_activity = None
|
||||
|
||||
def get_invites(self):
|
||||
return self._invites
|
||||
|
||||
def get_name(self):
|
||||
return self._nick
|
||||
|
||||
def announce(self):
|
||||
# Create and announce our presence
|
||||
color = profile.get_color()
|
||||
props = {'color': color.to_string(), 'icon-hash': self._icon_hash}
|
||||
self._service = self._pservice.register_service(self._nick,
|
||||
PRESENCE_SERVICE_TYPE, properties=props)
|
||||
#logging.debug("Owner '%s' using port %d" % (self._nick, self._service.get_port()))
|
||||
|
||||
#self._icon_stream = Stream.Stream.new_from_service(self._service)
|
||||
#self._icon_stream.register_reader_handler(self._handle_buddy_icon_request, "get_buddy_icon")
|
||||
#self._icon_stream.register_reader_handler(self._handle_invite, "invite")
|
||||
|
||||
def _handle_buddy_icon_request(self):
|
||||
"""XMLRPC method, return the owner's icon encoded with base64."""
|
||||
if self._icon:
|
||||
return base64.b64encode(self._icon)
|
||||
return ""
|
||||
|
||||
def _handle_invite(self, issuer, bundle_id, activity_id):
|
||||
"""XMLRPC method, called when the owner is invited to an activity."""
|
||||
self._invites.add_invite(issuer, bundle_id, activity_id)
|
||||
return ''
|
||||
|
||||
def __update_advertised_current_activity_cb(self):
|
||||
self._last_activity_update = time.time()
|
||||
self._pending_activity_update_timer = None
|
||||
if self._pending_activity_update:
|
||||
self.emit('current-activity-changed', self._pending_activity_update)
|
||||
logging.debug("*** Updating current activity to %s" % self._pending_activity_update)
|
||||
self._service.set_published_value('curact', dbus.String(self._pending_activity_update))
|
||||
return False
|
||||
|
||||
def set_current_activity(self, activity_id):
|
||||
"""Update our presence service with the latest activity, but no
|
||||
more frequently than every 30 seconds"""
|
||||
self._pending_activity_update = activity_id
|
||||
# If there's no pending update, we must not have updated it in the
|
||||
# last 30 seconds (except for the initial update, hence we also check
|
||||
# for the last update)
|
||||
if not self._pending_activity_update_timer or time.time() - self._last_activity_update > 30:
|
||||
self.__update_advertised_current_activity_cb()
|
||||
return
|
||||
|
||||
# If we have a pending update already, we have nothing left to do
|
||||
if self._pending_activity_update_timer:
|
||||
return
|
||||
|
||||
# Otherwise, we start a timer to update the activity at the next
|
||||
# interval, which should be 30 seconds from the last update, or if that
|
||||
# is in the past already, then now
|
||||
next = 30 - max(30, time.time() - self._last_activity_update)
|
||||
self._pending_activity_update_timer = gobject.timeout_add(next * 1000,
|
||||
self.__update_advertised_current_activity_cb)
|
||||
|
@ -17,8 +17,6 @@
|
||||
import gtk
|
||||
import dbus
|
||||
|
||||
from sugar.p2p import Stream
|
||||
from sugar.p2p import network
|
||||
import OverlayWindow
|
||||
|
||||
class ActivityChatWindow(gtk.Window):
|
||||
|
Loading…
Reference in New Issue
Block a user