Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/pippy_app.py
diff options
context:
space:
mode:
authorMorgan Collett <morgan.collett@gmail.com>2008-11-07 12:47:45 (GMT)
committer Morgan Collett <morgan.collett@gmail.com>2008-11-07 12:47:45 (GMT)
commit285bce0c9079337275cdffa630f2948198c8a688 (patch)
tree10b3f24febcee921c8338243923a6c783cac10d6 /pippy_app.py
parent7c59b52ae5b17c0a6430d23fa3c38a95a15b4f99 (diff)
Sugar API update: Use self.shared_activity not self._shared_activity
Diffstat (limited to 'pippy_app.py')
-rw-r--r--pippy_app.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/pippy_app.py b/pippy_app.py
index a6ffc11..6ee0a4f 100644
--- a/pippy_app.py
+++ b/pippy_app.py
@@ -74,7 +74,7 @@ class Chat(ViewSourceActivity):
self._chat_is_room = False
self.text_channel = None
- if self._shared_activity:
+ if self.shared_activity:
# we are joining the activity
self.connect('joined', self._joined_cb)
if self.get_shared():
@@ -96,7 +96,7 @@ class Chat(ViewSourceActivity):
def _one_to_one_connection(self, tp_channel):
"""Handle a private invite from a non-Sugar XMPP client."""
- if self._shared_activity or self.text_channel:
+ if self.shared_activity or self.text_channel:
return
bus_name, connection, channel = simplejson.loads(tp_channel)
logger.debug('GOT XMPP: %s %s %s', bus_name, connection,
@@ -126,22 +126,22 @@ class Chat(ViewSourceActivity):
def _setup(self):
self.text_channel = TextChannelWrapper(
- self._shared_activity.telepathy_text_chan,
- self._shared_activity.telepathy_conn)
+ self.shared_activity.telepathy_text_chan,
+ self.shared_activity.telepathy_conn)
self.text_channel.set_received_callback(self._received_cb)
self._alert(_('On-line'), _('Connected'))
- self._shared_activity.connect('buddy-joined', self._buddy_joined_cb)
- self._shared_activity.connect('buddy-left', self._buddy_left_cb)
+ self.shared_activity.connect('buddy-joined', self._buddy_joined_cb)
+ self.shared_activity.connect('buddy-left', self._buddy_left_cb)
self._chat_is_room = True
self.entry.set_sensitive(True)
self.entry.grab_focus()
def _joined_cb(self, activity):
"""Joined a shared activity."""
- if not self._shared_activity:
+ if not self.shared_activity:
return
logger.debug('Joined a shared chat')
- for buddy in self._shared_activity.get_joined_buddies():
+ for buddy in self.shared_activity.get_joined_buddies():
self._buddy_already_exists(buddy)
self._setup()