| ... |
... |
@@ -403,7 +403,7 @@ class Client(ConnectionHandlers): |
|
403
|
403
|
|
|
404
|
404
|
self.update_presence()
|
|
405
|
405
|
|
|
406
|
|
- def update_presence(self):
|
|
|
406
|
+ def update_presence(self, include_muc=True):
|
|
407
|
407
|
status, message, idle = self.get_presence_state()
|
|
408
|
408
|
self._priority = app.get_priority(self._account, status)
|
|
409
|
409
|
self.get_module('Presence').send_presence(
|
| ... |
... |
@@ -412,7 +412,8 @@ class Client(ConnectionHandlers): |
|
412
|
412
|
status=message,
|
|
413
|
413
|
idle_time=idle)
|
|
414
|
414
|
|
|
415
|
|
- self.get_module('MUC').update_presence()
|
|
|
415
|
+ if include_muc:
|
|
|
416
|
+ self.get_module('MUC').update_presence()
|
|
416
|
417
|
|
|
417
|
418
|
def get_module(self, name):
|
|
418
|
419
|
return modules.get(self._account, name)
|
| ... |
... |
@@ -427,12 +428,14 @@ class Client(ConnectionHandlers): |
|
427
|
428
|
elif self._connect_machine_calls == 3:
|
|
428
|
429
|
self.get_module('Roster').request_roster()
|
|
429
|
430
|
elif self._connect_machine_calls == 4:
|
|
430
|
|
- self._send_first_presence()
|
|
|
431
|
+ self._finish_connect()
|
|
431
|
432
|
|
|
432
|
|
- def _send_first_presence(self):
|
|
|
433
|
+ def _finish_connect(self):
|
|
433
|
434
|
self._status_sync_on_resume = False
|
|
434
|
435
|
self._set_client_available()
|
|
435
|
|
- self.update_presence()
|
|
|
436
|
+
|
|
|
437
|
+ # We did not resume the stream, so we are not joined any MUCs
|
|
|
438
|
+ self.update_presence(include_muc=False)
|
|
436
|
439
|
|
|
437
|
440
|
if not self.avatar_conversion:
|
|
438
|
441
|
# ask our VCard
|