[Telepathy-commits] [mingle/master] Some code cleanup and identation tweaks

[Sjoerd Simons]

---
 jingle.py |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/jingle.py b/jingle.py
index 067261a..6cf1f72 100644
--- a/jingle.py
+++ b/jingle.py
@@ -94,8 +94,7 @@ class JingleBaseDescription:
     def got_initiate(self, fssession, fsstream, content):
         self.prepare(fssession)
         self.initiate(fsstream)
-        codecs = self.content_to_codecs(content)
-        fsstream.set_remote_codecs(codecs)
+        self.fsstream.set_remote_codecs(self.content_to_codecs(content))
 
     def ready_for_accept(self):
         return self.fssession.get_codecs()
@@ -350,9 +349,9 @@ class JingleBaseTransport:
         self.transport_info(content)
 
     def ready_for_accept(self):
+        if self.connected == True:
+           return defer.succeed()
         if self.connected_deferred == None:
-            if self.connected == True:
-                return defer.succeed()
             self.connected_deferred = defer.Deferred()
         return self.connected_deferred
 
@@ -612,7 +611,7 @@ class JingleContent:
 
     def ready_for_accept(self):
         return defer.DeferredList([self.transport.ready_for_accept(),
-            self.description.ready_for_accept()])
+             self.description.ready_for_accept()])
 
     # Prepare for outgoing
     def prepare_got_caps(self, caps):
-- 
1.5.6.5