changeset 26fa02c41f3c in /home/hg/repos/gajim
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=26fa02c41f3c
description: don't try to configure a room for which we are not admin. See #7422
diffstat:
src/groupchat_control.py | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diffs (27 lines):
diff -r a0f2b4efcba1 -r 26fa02c41f3c src/groupchat_control.py
--- a/src/groupchat_control.py Tue Aug 13 01:10:59 2013 +0400
+++ b/src/groupchat_control.py Tue Aug 13 13:02:31 2013 +0200
@@ -1567,8 +1567,21 @@
gajim.automatic_rooms[self.account][self.room_jid]['invities']:
if self.room_jid not in gajim.interface.instances[
self.account]['gc_config']:
- gajim.connections[self.account].request_gc_config(
- self.room_jid)
+ if obj.role == 'owner':
+ # We need to configure the room if it's a new one.
+ # We cannot know it's a new one. Status 201 is not
+ # sent by all servers.
+ gajim.connections[self.account].request_gc_config(
+ self.room_jid)
+ elif 'continue_tag' not in gajim.automatic_rooms[
+ self.account][self.room_jid]:
+ # We just need to invite contacts
+ for jid in gajim.automatic_rooms[self.account][
+ self.room_jid]['invities']:
+ obj.conn.send_invite(self.room_jid, jid)
+ self.print_conversation(_('%(jid)s has been '
+ 'invited in this room') % {'jid': jid},
+ graphics=False)
if '100' in obj.status_code:
# Can be a message (see handle_event_gc_config_change in
# gajim.py)
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
