copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix var name .. 2 var can't have the same name

This commit is contained in:
Yann Leboulanger 2005-10-06 20:28:38 +00:00
parent 011115ae80
commit b91e380fcc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tabbed_chat_window.py
View File

@ -762,7 +762,7 @@ class TabbedChatWindow(chat.Chat):
if len(gajim.contacts[self.account][jid]) == 1: if len(gajim.contacts[self.account][jid]) == 1:
self.plugin.roster.really_remove_contact(contact, self.account) self.plugin.roster.really_remove_contact(contact, self.account)
def print_conversation(self, text, jid, contact = '', tim = None, def print_conversation(self, text, jid, frm = '', tim = None,
encrypted = False, subject = None): encrypted = False, subject = None):
"""Print a line in the conversation: """Print a line in the conversation:
if contact is set to status: it's a status message if contact is set to status: it's a status message
@ -770,7 +770,7 @@ class TabbedChatWindow(chat.Chat):
if contact is set to print_queue: it is incomming from queue if contact is set to print_queue: it is incomming from queue
if contact is not set: it's an incomming message""" if contact is not set: it's an incomming message"""
contact = self.contacts[jid] contact = self.contacts[jid]
if contact == 'status': if frm == 'status':
kind = 'status' kind = 'status'
name = '' name = ''
else: else:
@ -786,10 +786,10 @@ class TabbedChatWindow(chat.Chat):
'status', '', tim) 'status', '', tim)
ec.remove(jid) ec.remove(jid)
self.xmls[jid].get_widget('gpg_togglebutton').set_active(encrypted) self.xmls[jid].get_widget('gpg_togglebutton').set_active(encrypted)
if not contact: if not frm:
kind = 'incoming' kind = 'incoming'
name = contact.name name = contact.name
elif contact == 'print_queue': # incoming message, but do not update time elif frm == 'print_queue': # incoming message, but do not update time
kind = 'incoming_queue' kind = 'incoming_queue'
name = contact.name name = contact.name
else: else: