changeset 83d5005aedaa in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=83d5005aedaa
description: make using receiver proxy work

diffstat:

 src/common/jingle_ft.py |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r d6901d0eed53 -r 83d5005aedaa src/common/jingle_ft.py
--- a/src/common/jingle_ft.py   Wed Aug 22 14:49:44 2012 +0200
+++ b/src/common/jingle_ft.py   Wed Aug 22 18:09:40 2012 +0200
@@ -110,9 +110,12 @@
 
     def __state_changed(self, nextstate, args=None):
         # Executes the next state action and sets the next state
+        current_state = self.state
         st = self.states[nextstate]
         st.action(args)
-        self.state = nextstate
+        # state can have been changed during the action. Don't go back.
+        if self.state == current_state:
+            self.state = nextstate
 
     def __on_session_initiate(self, stanza, content, error, action):
         gajim.nec.push_incoming_event(FileRequestReceivedEvent(None,
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to