Author: jim++
Date: 2007-02-11 04:22:40 +0100 (Sun, 11 Feb 2007)
New Revision: 7964
Modified:
trunk/src/common/connection.py
trunk/src/groupchat_control.py
Log:
Delete change_nick() func, use join_gc() instead. Fixes #2903.
Modified: trunk/src/common/connection.py
===================================================================
--- trunk/src/common/connection.py 2007-02-11 02:35:02 UTC (rev 7963)
+++ trunk/src/common/connection.py 2007-02-11 03:22:40 UTC (rev 7964)
@@ -1141,7 +1141,7 @@
t.setTagData('password', password)
self.connection.send(p)
- #last date/time in history to avoid duplicate
+ # last date/time in history to avoid duplicate
if not self.last_history_line.has_key(room_jid):
# Not in memory, get it from DB
last_log = gajim.logger.get_last_date_that_has_logs(room_jid,
@@ -1170,13 +1170,6 @@
to = room_jid)
self.connection.send(iq)
- def change_gc_nick(self, room_jid, nick):
- if not self.connection:
- return
- p = common.xmpp.Presence(to = '%s/%s' % (room_jid, nick))
- p = self.add_sha(p)
- self.connection.send(p)
-
def send_gc_status(self, nick, jid, show, status):
if not self.connection:
return
Modified: trunk/src/groupchat_control.py
===================================================================
--- trunk/src/groupchat_control.py 2007-02-11 02:35:02 UTC (rev 7963)
+++ trunk/src/groupchat_control.py 2007-02-11 03:22:40 UTC (rev 7964)
@@ -1048,7 +1048,7 @@
if len(message_array) and message_array[0] != self.nick:
nick = message_array[0]
nick = helpers.parse_resource(nick)
- gajim.connections[self.account].change_gc_nick(self.room_jid, nick)
+ gajim.connections[self.account].join_gc(nick, self.room_jid, None)
self.clear(self.msg_textview)
else:
self.get_command_help(command)
@@ -1329,7 +1329,7 @@
def on_ok(widget):
nick = instance.input_entry.get_text().decode('utf-8')
nick = helpers.parse_resource(nick)
- gajim.connections[self.account].change_gc_nick(self.room_jid, nick)
+ gajim.connections[self.account].join_gc(nick, self.room_jid, None)
self.nick = nick
instance = dialogs.InputDialog(title, prompt, proposed_nick,
is_modal = False, ok_handler = on_ok)