diff options
| author | Riccardo (C10uD) <c10ud.dev@gmail.com> | 2011-08-17 12:46:32 +0200 |
|---|---|---|
| committer | Riccardo (C10uD) <c10ud.dev@gmail.com> | 2011-09-01 14:07:41 +0200 |
| commit | b3a9aba14d2524c6b60d7f114ceb49b73168eebd (patch) | |
| tree | 3621467d65c30f89d65d213bea13c69588f9e97c | |
| parent | 3bc1795bd8f44219881d0604607bc9a8102325c4 (diff) | |
switchboard: don't timeout when using keepalive
| -rw-r--r-- | papyon/msnp/switchboard.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/papyon/msnp/switchboard.py b/papyon/msnp/switchboard.py index 1c3eda6..78da280 100644 --- a/papyon/msnp/switchboard.py +++ b/papyon/msnp/switchboard.py @@ -314,7 +314,7 @@ class SwitchboardProtocol(BaseProtocol): if self.inactivity_timer_id: gobject.source_remove(self.inactivity_timer_id) self.inactivity_timer_id = 0 - if len(self.participants) == 1: # don't leave multi-user conversations + if len(self.participants) == 1 and not self.keepalive_timer_id: self.inactivity_timer_id = gobject.timeout_add_seconds(60, self.leave, True) # callbacks -------------------------------------------------------------- |