Changeset 9889
- Timestamp:
- 07/05/08 21:04:27 (5 months ago)
- Location:
- trunk/src
- Files:
-
- 6 modified
-
common/contacts.py (modified) (1 diff)
-
dialogs.py (modified) (1 diff)
-
filetransfers_window.py (modified) (1 diff)
-
gajim.py (modified) (6 diffs)
-
roster_window.py (modified) (8 diffs)
-
session.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/common/contacts.py
r9884 r9889 187 187 chatstate=None, last_status_time=None, composing_xep=None, 188 188 mood={}, tune={}, activity={}): 189 return Contact(jid, name, groups, show, status, sub, ask, resource, 190 priority, keyID, our_chatstate, chatstate, last_status_time, 191 None, composing_xep, mood, tune, activity) 189 return Contact(jid=jid, name=name, groups=groups, show=show, 190 status=status, sub=sub, ask=ask, resource=resource, priority=priority, 191 keyID=keyID, chatstate=our_chatstate, chatstate=chatstate, 192 last_status_time=last_status_time, composing_xep=composing_xep, 193 mood=mood, tune=tune, activity=activity) 192 194 193 195 def copy_contact(self, contact): 194 return self.create_contact(jid = contact.jid, name = contact.name, 195 groups = contact.groups, show = contact.show, status = 196 contact.status, sub = contact.sub, ask = contact.ask, resource = contact.resource, 197 priority = contact.priority, keyID = contact.keyID, 198 our_chatstate = contact.our_chatstate, chatstate = contact.chatstate, 199 last_status_time = contact.last_status_time) 196 return self.create_contact(jid=contact.jid, name=contact.name, 197 groups=contact.groups, show=contact.show, status=contact.status, 198 sub=contact.sub, ask=contact.ask, resource=contact.resource, 199 priority=contact.priority, keyID=contact.keyID, 200 caps_node=contact.caps_node, caps_hash_method=contact.caps_hash_method, 201 caps_hash=contact.caps_hash, our_chatstate=contact.our_chatstate, 202 chatstate=contact.chatstate, last_status_time=contact.last_status_time) 200 203 201 204 def add_contact(self, account, contact): -
trunk/src/dialogs.py
r9864 r9889 1603 1603 gajim.interface.instances[self.account]['infos'][self.jid].window.present() 1604 1604 else: 1605 contact = gajim.contacts.create_contact(jid =self.jid, name='',1605 contact = gajim.contacts.create_contact(jid=self.jid, name='', 1606 1606 groups=[], show='', status='', sub='', ask='', resource='', 1607 1607 priority=5, keyID='', our_chatstate=None, chatstate=None) -
trunk/src/filetransfers_window.py
r9091 r9889 277 277 return 278 278 (jid, resource) = contact.split('/', 1) 279 contact = gajim.contacts.create_contact(jid = jid, 280 resource = resource) 279 contact = gajim.contacts.create_contact(jid=jid, resource=resource) 281 280 (file_dir, file_name) = os.path.split(file_path) 282 281 file_props = self.get_send_file_props(account, contact, -
trunk/src/gajim.py
r9886 r9889 674 674 if resource == gajim.connections[account].server_resource: 675 675 return 676 contact1 = gajim.contacts.create_contact(jid = ji, 677 name = gajim.nicks[account], groups = ['self_contact'], 678 show = array[1], status = status_message, sub = 'both', 679 ask = 'none', priority = priority, keyID = keyID, 680 resource = resource) 676 contact1 = gajim.contacts.create_contact(jid=ji, 677 name=gajim.nicks[account], groups=['self_contact'], 678 show=array[1], status=status_message, sub='both', ask='none', 679 priority=priority, keyID=keyID, resource=resource) 681 680 old_show = 0 682 681 gajim.contacts.add_contact(account, contact1) … … 870 869 name = jid.split('@', 1)[0] 871 870 name = name.split('%', 1)[0] 872 contact1 = gajim.contacts.create_contact(jid = jid, name =name,873 groups = [], show = 'online', status ='online',874 ask = 'to', resource = array[1], keyID =keyID)871 contact1 = gajim.contacts.create_contact(jid=jid, name=name, 872 groups=[], show='online', status='online', 873 ask='to', resource=array[1], keyID=keyID) 875 874 gajim.contacts.add_contact(account, contact1) 876 875 self.roster.add_contact(jid, account) … … 1402 1401 return 1403 1402 # Add new contact to roster 1404 contact = gajim.contacts.create_contact(jid = jid, name =name,1405 groups = groups, show = 'offline', sub = sub, ask =ask)1403 contact = gajim.contacts.create_contact(jid=jid, name=name, 1404 groups=groups, show='offline', sub=sub, ask=ask) 1406 1405 gajim.contacts.add_contact(account, contact) 1407 1406 self.roster.add_contact(jid, account) … … 1541 1540 if jid in attached_keys: 1542 1541 keyID = attached_keys[attached_keys.index(jid) + 1] 1543 contact = gajim.contacts.create_contact(jid = jid, name ='',1544 groups = [_('Not in Roster')], show = 'not in roster', status ='',1545 sub = 'none', keyID =keyID)1542 contact = gajim.contacts.create_contact(jid=jid, name='', 1543 groups=[_('Not in Roster')], show='not in roster', status='', 1544 sub='none', keyID=keyID) 1546 1545 gajim.contacts.add_contact(account, contact) 1547 1546 self.roster.add_contact(contact.jid, account) … … 2485 2484 if minimize and not minimized_control_exists and \ 2486 2485 not self.msg_win_mgr.has_window(room_jid, account): 2487 contact = gajim.contacts.create_contact(jid = room_jid, name =nick)2486 contact = gajim.contacts.create_contact(jid=room_jid, name=nick) 2488 2487 gc_control = GroupchatControl(None, contact, account) 2489 2488 self.minimized_controls[account][room_jid] = gc_control … … 2509 2508 def new_room(self, room_jid, nick, account, is_continued=False): 2510 2509 # Get target window, create a control, and associate it with the window 2511 contact = gajim.contacts.create_contact(jid = room_jid, name =nick)2510 contact = gajim.contacts.create_contact(jid=room_jid, name=nick) 2512 2511 mw = self.msg_win_mgr.get_window(contact.jid, account) 2513 2512 if not mw: -
trunk/src/roster_window.py
r9884 r9889 732 732 show = 'offline' 733 733 status = '' 734 contact = gajim.contacts.create_contact(jid = jid, name = jid, 735 groups = [_('Groupchats')], show = show, 736 status = status, sub = 'none') 734 contact = gajim.contacts.create_contact(jid=jid, name=jid, 735 groups=[_('Groupchats')], show=show, status=status, sub='none') 737 736 gajim.contacts.add_contact(account, contact) 738 737 self.add_contact(jid, account) … … 759 758 contact = gajim.contacts.get_contact_with_highest_priority(account, jid) 760 759 if contact is None: 761 contact = gajim.contacts.create_contact(jid = jid, name =jid,762 groups = [_('Transports')], show ='offline',763 s tatus = 'offline', sub ='from')760 contact = gajim.contacts.create_contact(jid=jid, name=jid, 761 groups=[_('Transports')], show='offline', status='offline', 762 sub='from') 764 763 gajim.contacts.add_contact(account, contact) 765 764 self.add_contact(jid, account) … … 857 856 if jid in attached_keys: 858 857 keyID = attached_keys[attached_keys.index(jid) + 1] 859 contact = gajim.contacts.create_contact(jid = jid, name =nick,860 groups = [_('Not in Roster')], show = 'not in roster', status ='',861 sub = 'none', resource = resource, keyID =keyID)858 contact = gajim.contacts.create_contact(jid=jid, name=nick, 859 groups=[_('Not in Roster')], show='not in roster', status='', 860 sub='none', resource=resource, keyID=keyID) 862 861 gajim.contacts.add_contact(account, contact) 863 862 self.add_contact(contact.jid, account) … … 1484 1483 if gajim.jid_is_transport(jid): 1485 1484 array[jid]['groups'] = [_('Transports')] 1486 contact1 = gajim.contacts.create_contact(jid = ji, name =name,1487 groups = array[jid]['groups'], show = show, status =status,1488 sub = array[jid]['subscription'], ask =array[jid]['ask'],1489 resource = resource, keyID =keyID)1485 contact1 = gajim.contacts.create_contact(jid=ji, name=name, 1486 groups=array[jid]['groups'], show=show, status=status, 1487 sub=array[jid]['subscription'], ask=array[jid]['ask'], 1488 resource=resource, keyID=keyID) 1490 1489 gajim.contacts.add_contact(account, contact1) 1491 1490 … … 1691 1690 if jid in attached_keys: 1692 1691 keyID = attached_keys[attached_keys.index(jid) + 1] 1693 contact = gajim.contacts.create_contact(jid = jid, name =nickname,1694 groups = groups, show = 'requested', status = '', ask ='none',1695 sub = 'subscribe', keyID =keyID)1692 contact = gajim.contacts.create_contact(jid=jid, name=nickname, 1693 groups=groups, show='requested', status='', ask='none', 1694 sub='subscribe', keyID=keyID) 1696 1695 gajim.contacts.add_contact(account, contact) 1697 1696 else: … … 2219 2218 if gajim.account_is_connected(account): 2220 2219 account_name += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) 2221 contact = gajim.contacts.create_contact(jid = jid, 2222 name = account_name, show = connection.get_status(), sub = '', 2223 status = connection.status, 2224 resource = connection.server_resource, 2225 priority = connection.priority, 2226 mood = connection.mood, 2227 tune = connection.tune, 2228 activity = connection.activity) 2220 contact = gajim.contacts.create_contact(jid=jid, name=account_name, 2221 show=connection.get_status(), sub='', status=connection.status, 2222 resource=connection.server_resource, 2223 priority=connection.priority, mood=connection.mood, 2224 tune=connection.tune, activity=connection.activity) 2229 2225 if gajim.connections[account].gpg: 2230 2226 contact.keyID = gajim.config.get_per('accounts', connection.name, … … 2251 2247 if not show: 2252 2248 show = 'online' 2253 contact = gajim.contacts.create_contact(jid =jid,2254 name = account, groups = ['self_contact'], show =show,2255 status = roster.getStatus(jid+'/'+resource),2256 resource =resource,2257 priority = roster.getPriority(jid+'/'+resource))2249 contact = gajim.contacts.create_contact(jid=jid, 2250 name=account, groups=['self_contact'], show=show, 2251 status=roster.getStatus(jid + '/' + resource), 2252 resource=resource, 2253 priority=roster.getPriority(jid + '/' + resource)) 2258 2254 contacts.append(contact) 2259 2255 if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: … … 4543 4539 self.on_service_disco_menuitem_activate, account) 4544 4540 hostname = gajim.config.get_per('accounts', account, 'hostname') 4545 contact = gajim.contacts.create_contact(jid =hostname) # Fake contact4541 contact = gajim.contacts.create_contact(jid=hostname) # Fake contact 4546 4542 execute_command_menuitem.connect('activate', 4547 4543 self.on_execute_command, contact, account) -
trunk/src/session.py
r9880 r9889 450 450 451 451 if not contact: 452 contact = gajim.contacts.create_contact(jid =jid,453 resource = resource, show =self.conn.get_status())452 contact = gajim.contacts.create_contact(jid=jid, 453 resource=resource, show=self.conn.get_status()) 454 454 455 455 gajim.interface.new_chat(contact, account,
