Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-06-18 09:43:59 (GMT)
committer Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-06-18 09:43:59 (GMT)
commita5cddd95b088920438877a7325b8798b04e48b74 (patch)
tree587e9896d5591bcbf328bfdf91f44e5304551ad8
parent698c6c8dc94a9be222a2a63c91b9d1cdf5524d7b (diff)
Revert "Handle channels incoming through ChannelDispatcher"
This reverts commit 698c6c8dc94a9be222a2a63c91b9d1cdf5524d7b.
-rw-r--r--pippy_app.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/pippy_app.py b/pippy_app.py
index 8706efe..3909d7a 100644
--- a/pippy_app.py
+++ b/pippy_app.py
@@ -77,7 +77,7 @@ class Chat(ViewSourceActivity):
toolbar_box.toolbar.insert(StopButton(self), -1)
toolbar_box.show_all()
- self.owner = None #self._pservice.get_owner()
+ self.owner = self._pservice.get_owner()
self._chat_log = ''
# Auto vs manual scrolling:
self._scroll_auto = True
@@ -111,11 +111,6 @@ class Chat(ViewSourceActivity):
logger.debug('Chat was shared')
self._setup()
- def connect_to_channel(self, bus_name, connection, channel):
- conn = Connection(
- bus_name, connection, ready_handler=lambda conn: \
- self._one_to_one_connection_ready_cb(bus_name, channel, conn))
-
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: