All pastes #68507 Raw Edit

Something

public text v1 · immutable
#68507 ·published 2006-06-21 18:14 UTC
rendered paste body
diff -rN -u old-cohoba/cohoba/telepathy/Account.py new-cohoba/cohoba/telepathy/Account.py
--- old-cohoba/cohoba/telepathy/Account.py      2006-06-21 19:14:11.652725823 +0100
+++ new-cohoba/cohoba/telepathy/Account.py      2006-06-21 19:14:11.680728378 +0100
@@ -55,6 +55,7 @@
                if self.account.endswith("@gmail.com"):
                        params["server"] = "talk.google.com"
                        params["old-ssl"] = True
+                       params["ignore-ssl-errors"] = True
                        import dbus
                        params["port"] = dbus.UInt32(5223)

diff -rN -u old-cohoba/cohoba/telepathy/ChannelHandler.py new-cohoba/cohoba/telepathy/ChannelHandler.py
--- old-cohoba/cohoba/telepathy/ChannelHandler.py       2006-06-21 19:14:11.652725823 +0100
+++ new-cohoba/cohoba/telepathy/ChannelHandler.py       2006-06-21 19:14:11.680728378 +0100
@@ -27,12 +27,12 @@
                get_account_list().connect("account-added", self.on_account_added)
                get_account_list().connect("account-deleted", self.on_account_deleted)

-               #get_proxy_provider().create_proxy(
-               #       "org.freedesktop.Telepathy.VoipEngine",
-               #       "/org/freedesktop/Telepathy/VoipEngine")
-               #self.voip_engine_iface = get_proxy_provider().get_iface(
-               #       "/org/freedesktop/Telepathy/VoipEngine",
-               #       "org.freedesktop.Telepathy.ChannelHandler")
+               get_proxy_provider().create_proxy(
+                       "org.freedesktop.Telepathy.VoipEngine",
+                       "/org/freedesktop/Telepathy/VoipEngine")
+               self.voip_engine_iface = get_proxy_provider().get_iface(
+                       "/org/freedesktop/Telepathy/VoipEngine",
+                       "org.freedesktop.Telepathy.ChannelHandler")

        def stop(self):
                for row in get_account_list():
@@ -137,11 +137,14 @@
                        handled = True

                elif chan_type == CT_STREAMED_MEDIA:
-                       window = get_conversation_window_manager().show_existing(
-                               account.conn_obj_path, handle)
                        print (account.conn_obj_path, chan_obj, handle)
+
                        media = TelepathyGroup(account.conn_obj_path, chan_obj, handle)
-                       window.start_media(media)
+
+                       if handle:
+                               window = get_conversation_window_manager().show_existing(
+                                       account.conn_obj_path, handle)
+                               window.start_media(media)

                        self.voip_engine_iface.HandleChannel(
                                get_proxy_provider().get_service(account.conn_obj_path),
diff -rN -u old-cohoba/cohoba/ui/ConversationWindow.py new-cohoba/cohoba/ui/ConversationWindow.py
--- old-cohoba/cohoba/ui/ConversationWindow.py  2006-06-21 19:14:11.656726188 +0100
+++ new-cohoba/cohoba/ui/ConversationWindow.py  2006-06-21 19:14:11.684728743 +0100
@@ -65,9 +65,8 @@
                return self.hide_on_delete

        def on_talk_toggled(self, button):
-               #from cohoba.telepathy.ChannelHandler import get_channel_handler
-               #get_channel_handler().start_media(self.conversation.contact)
-               pass
+               from cohoba.telepathy.ChannelHandler import get_channel_handler
+               get_channel_handler().start_media(self.conversation.contact)

        def start_media(self, group):
                print 'Starting media conversation from chan handler'