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

move groupchat.contacts to gajim.gc_contacts

This commit is contained in:
Yann Leboulanger 2005-07-25 20:04:24 +00:00
parent c622f62607
commit a3cbad7ad7
4 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/gajim.py
View File

@ -46,6 +46,8 @@ last_message_time = {} # list of time of the latest incomming message
encrypted_chats = {} # list of encrypted chats {acct1: [jid1, jid2], ..} encrypted_chats = {} # list of encrypted chats {acct1: [jid1, jid2], ..}
contacts = {} # list of contacts {acct: {jid1: [C1, C2]}, } one Contact per resource contacts = {} # list of contacts {acct: {jid1: [C1, C2]}, } one Contact per resource
gc_contacts = {} # list of contacts that are in gc {acct: {room_jid: {nick: C}}}
groups = {} # list of groups groups = {} # list of groups
newly_added = {} # list of contacts that has just signed in newly_added = {} # list of contacts that has just signed in
to_be_removed = {} # list of contacts that has just signed out to_be_removed = {} # list of contacts that has just signed out

4
src/config.py
View File

@ -1199,6 +1199,7 @@ _('To change the account name, you must be disconnected.')).get_response()
gajim.allow_notifications[self.account] gajim.allow_notifications[self.account]
gajim.groups[name] = gajim.groups[self.account] gajim.groups[name] = gajim.groups[self.account]
gajim.contacts[name] = gajim.contacts[self.account] gajim.contacts[name] = gajim.contacts[self.account]
gajim.gc_contacts[name] = gajim.gc_contacts[self.account]
gajim.newly_added[name] = gajim.newly_added[self.account] gajim.newly_added[name] = gajim.newly_added[self.account]
gajim.to_be_removed[name] = gajim.to_be_removed[self.account] gajim.to_be_removed[name] = gajim.to_be_removed[self.account]
gajim.sleeper_state[name] = gajim.sleeper_state[self.account] gajim.sleeper_state[name] = gajim.sleeper_state[self.account]
@ -1225,6 +1226,7 @@ _('To change the account name, you must be disconnected.')).get_response()
del gajim.allow_notifications[self.account] del gajim.allow_notifications[self.account]
del gajim.groups[self.account] del gajim.groups[self.account]
del gajim.contacts[self.account] del gajim.contacts[self.account]
del gajim.gc_contacts[self.account]
del gajim.newly_added[self.account] del gajim.newly_added[self.account]
del gajim.to_be_removed[self.account] del gajim.to_be_removed[self.account]
del gajim.sleeper_state[self.account] del gajim.sleeper_state[self.account]
@ -1275,6 +1277,7 @@ _('To change the account name, you must be disconnected.')).get_response()
gajim.connections[name].connected = 0 gajim.connections[name].connected = 0
gajim.groups[name] = {} gajim.groups[name] = {}
gajim.contacts[name] = {} gajim.contacts[name] = {}
gajim.gc_contacts[name] = {}
gajim.newly_added[name] = [] gajim.newly_added[name] = []
gajim.to_be_removed[name] = [] gajim.to_be_removed[name] = []
gajim.nicks[name] = config['name'] gajim.nicks[name] = config['name']
@ -2374,6 +2377,7 @@ class RemoveAccountWindow:
del gajim.allow_notifications[self.account] del gajim.allow_notifications[self.account]
del gajim.groups[self.account] del gajim.groups[self.account]
del gajim.contacts[self.account] del gajim.contacts[self.account]
del gajim.gc_contacts[self.account]
del gajim.to_be_removed[self.account] del gajim.to_be_removed[self.account]
del gajim.newly_added[self.account] del gajim.newly_added[self.account]
del gajim.sleeper_state[self.account] del gajim.sleeper_state[self.account]

4
src/gajim.py
View File

@ -377,8 +377,7 @@ class Interface:
qs[fjid] = [] qs[fjid] = []
qs[fjid].append((array[1], array[2], array[3])) qs[fjid].append((array[1], array[2], array[3]))
self.roster.nb_unread += 1 self.roster.nb_unread += 1
gc = self.windows[account]['gc'][jid] show = gajim.gc_contacts[account][jid][nick].show
show = gc.contacts[jid][nick].show
c = Contact(jid = fjid, name = nick, groups = ['none'], show = show, c = Contact(jid = fjid, name = nick, groups = ['none'], show = show,
ask = 'none') ask = 'none')
self.roster.new_chat(c, account) self.roster.new_chat(c, account)
@ -959,6 +958,7 @@ class Interface:
self.windows[a] = {'infos': {}, 'chats': {}, 'gc': {}, 'gc_config': {}} self.windows[a] = {'infos': {}, 'chats': {}, 'gc': {}, 'gc_config': {}}
gajim.contacts[a] = {} gajim.contacts[a] = {}
gajim.groups[a] = {} gajim.groups[a] = {}
gajim.gc_contacts[a] = {}
gajim.newly_added[a] = [] gajim.newly_added[a] = []
gajim.to_be_removed[a] = [] gajim.to_be_removed[a] = []
gajim.awaiting_messages[a] = {} gajim.awaiting_messages[a] = {}

46
src/groupchat_window.py
View File

@ -49,7 +49,7 @@ class GroupchatWindow(chat.Chat):
'me', 'msg', 'nick', 'topic'] 'me', 'msg', 'nick', 'topic']
self.nicks = {} # our nick for each groupchat we are in self.nicks = {} # our nick for each groupchat we are in
self.contacts = {} # contact instances for each room gajim.gc_contacts[account] = {} # contact instances for each room
self.list_treeview = {} self.list_treeview = {}
self.subjects = {} self.subjects = {}
self.name_labels = {} self.name_labels = {}
@ -92,7 +92,6 @@ class GroupchatWindow(chat.Chat):
return {} return {}
return { return {
'nick': self.nicks[room_jid], 'nick': self.nicks[room_jid],
'contacts': self.contacts[room_jid],
'model': self.list_treeview[room_jid].get_model(), 'model': self.list_treeview[room_jid].get_model(),
'subject': self.subjects[room_jid], 'subject': self.subjects[room_jid],
} }
@ -103,7 +102,7 @@ class GroupchatWindow(chat.Chat):
self.list_treeview[room_jid].set_model(var['model']) self.list_treeview[room_jid].set_model(var['model'])
self.list_treeview[room_jid].expand_all() self.list_treeview[room_jid].expand_all()
self.set_subject(room_jid, var['subject']) self.set_subject(room_jid, var['subject'])
self.subjects[room_jid] = var['contacts'] self.subjects[room_jid] = var['subject']
def on_close_window_activate(self, widget): def on_close_window_activate(self, widget):
if not self.on_groupchat_window_delete_event(widget, None): if not self.on_groupchat_window_delete_event(widget, None):
@ -207,7 +206,7 @@ class GroupchatWindow(chat.Chat):
def get_nick_list(self, room_jid): def get_nick_list(self, room_jid):
'''get nicks of contacts in a room''' '''get nicks of contacts in a room'''
return self.contacts[room_jid].keys() return gajim.gc_contacts[self.account][room_jid].keys()
def remove_contact(self, room_jid, nick): def remove_contact(self, room_jid, nick):
"""Remove a user from the contacts_list""" """Remove a user from the contacts_list"""
@ -215,8 +214,8 @@ class GroupchatWindow(chat.Chat):
iter = self.get_contact_iter(room_jid, nick) iter = self.get_contact_iter(room_jid, nick)
if not iter: if not iter:
return return
if self.contacts[room_jid].has_key(nick): if gajim.gc_contacts[self.account][room_jid].has_key(nick):
del self.contacts[room_jid][nick] del gajim.gc_contacts[self.account][room_jid][nick]
parent_iter = model.iter_parent(iter) parent_iter = model.iter_parent(iter)
model.remove(iter) model.remove(iter)
if model.iter_n_children(parent_iter) == 0: if model.iter_n_children(parent_iter) == 0:
@ -251,16 +250,16 @@ class GroupchatWindow(chat.Chat):
(self.plugin.roster.jabber_state_images['closed'], role, (self.plugin.roster.jabber_state_images['closed'], role,
'<b>%s</b>' % role_name)) '<b>%s</b>' % role_name))
iter = model.append(role_iter, (image, nick, self.escape(nick))) iter = model.append(role_iter, (image, nick, self.escape(nick)))
self.contacts[room_jid][nick] = Contact(jid = j, name = nick, gajim.gc_contacts[self.account][room_jid][nick] = \
show = show, resource = resource, role = role, Contact(jid = j, name = nick, show = show, resource = resource,
affiliation = affiliation) role = role, affiliation = affiliation)
self.list_treeview[room_jid].expand_row((model.get_path(role_iter)), self.list_treeview[room_jid].expand_row((model.get_path(role_iter)),
False) False)
return iter return iter
def get_role(self, room_jid, nick): def get_role(self, room_jid, nick):
if self.contacts[room_jid].has_key(nick): if gajim.gc_contacts[self.account][room_jid].has_key(nick):
return self.contacts[room_jid][nick].role return gajim.gc_contacts[self.account][room_jid][nick].role
else: else:
return 'visitor' return 'visitor'
@ -277,7 +276,7 @@ class GroupchatWindow(chat.Chat):
continue continue
while user_iter: while user_iter:
nick = model.get_value(user_iter, 1) nick = model.get_value(user_iter, 1)
show = self.contacts[room_jid][nick].show show = gajim.gc_contacts[self.account][room_jid][nick].show
state_images = roster.get_appropriate_state_images(room_jid) state_images = roster.get_appropriate_state_images(room_jid)
image = state_images[show] #FIXME: always Jabber why? image = state_images[show] #FIXME: always Jabber why?
model.set_value(user_iter, 0, image) model.set_value(user_iter, 0, image)
@ -310,7 +309,7 @@ class GroupchatWindow(chat.Chat):
self.remove_contact(room_jid, nick) self.remove_contact(room_jid, nick)
if nick == self.nicks[room_jid] and statusCode != '303': # We became offline if nick == self.nicks[room_jid] and statusCode != '303': # We became offline
model.clear() model.clear()
self.contacts[room_jid] = {} gajim.gc_contacts[self.account][room_jid] = {}
else: else:
iter = self.get_contact_iter(room_jid, nick) iter = self.get_contact_iter(room_jid, nick)
if not iter: if not iter:
@ -322,7 +321,7 @@ class GroupchatWindow(chat.Chat):
self.add_contact_to_roster(room_jid, nick, show, role, jid, self.add_contact_to_roster(room_jid, nick, show, role, jid,
affiliation) affiliation)
else: else:
c = self.contacts[room_jid][nick] c = gajim.gc_contacts[self.account][room_jid][nick]
if c.show == show and c.status == status and \ if c.show == show and c.status == status and \
c.affiliation == affiliation: #no change c.affiliation == affiliation: #no change
return return
@ -717,7 +716,7 @@ class GroupchatWindow(chat.Chat):
def on_info(self, widget, room_jid, nick): def on_info(self, widget, room_jid, nick):
"""Call vcard_information_window class to display user's information""" """Call vcard_information_window class to display user's information"""
c = self.contacts[room_jid][nick] c = gajim.gc_contacts[self.account][room_jid][nick]
if c.jid and c.resource: # on GC, we know resource only if we're mod and up if c.jid and c.resource: # on GC, we know resource only if we're mod and up
jid = c.jid jid = c.jid
fjid = c.jid + '/' + c.resource fjid = c.jid + '/' + c.resource
@ -745,7 +744,7 @@ class GroupchatWindow(chat.Chat):
room_jid = self.get_active_jid() room_jid = self.get_active_jid()
fjid = gajim.construct_fjid(room_jid, nick) # 'fake' jid fjid = gajim.construct_fjid(room_jid, nick) # 'fake' jid
if not self.plugin.windows[self.account]['chats'].has_key(fjid): if not self.plugin.windows[self.account]['chats'].has_key(fjid):
show = self.contacts[room_jid][nick].show show = gajim.gc_contacts[self.account][room_jid][nick].show
u = Contact(jid = fjid, name = nick, groups = ['none'], show = show, u = Contact(jid = fjid, name = nick, groups = ['none'], show = show,
sub = 'none') sub = 'none')
self.plugin.roster.new_chat(u, self.account) self.plugin.roster.new_chat(u, self.account)
@ -791,14 +790,15 @@ class GroupchatWindow(chat.Chat):
"""Make user's popup menu""" """Make user's popup menu"""
model = self.list_treeview[room_jid].get_model() model = self.list_treeview[room_jid].get_model()
nick = model[iter][1] nick = model[iter][1]
c = self.contacts[room_jid][nick] c = gajim.gc_contacts[self.account][room_jid][nick]
jid = c.jid jid = c.jid
target_affiliation = c.affiliation target_affiliation = c.affiliation
target_role = c.role target_role = c.role
# looking for user's affiliation and role # looking for user's affiliation and role
user_nick = self.nicks[room_jid] user_nick = self.nicks[room_jid]
user_affiliation = self.contacts[room_jid][user_nick].affiliation user_affiliation = gajim.gc_contacts[self.account][room_jid][user_nick].\
affiliation
user_role = self.get_role(room_jid, user_nick) user_role = self.get_role(room_jid, user_nick)
# making menu from glade # making menu from glade
@ -887,7 +887,7 @@ class GroupchatWindow(chat.Chat):
gajim.connections[self.account].send_gc_status(self.nicks[room_jid], gajim.connections[self.account].send_gc_status(self.nicks[room_jid],
room_jid, 'offline', 'offline') room_jid, 'offline', 'offline')
del self.nicks[room_jid] del self.nicks[room_jid]
del self.contacts[room_jid] del gajim.gc_contacts[self.account][room_jid]
del self.list_treeview[room_jid] del self.list_treeview[room_jid]
del self.subjects[room_jid] del self.subjects[room_jid]
del self.name_labels[room_jid] del self.name_labels[room_jid]
@ -899,7 +899,7 @@ class GroupchatWindow(chat.Chat):
self.childs[room_jid] = self.xmls[room_jid].get_widget('gc_vbox') self.childs[room_jid] = self.xmls[room_jid].get_widget('gc_vbox')
chat.Chat.new_tab(self, room_jid) chat.Chat.new_tab(self, room_jid)
self.nicks[room_jid] = nick self.nicks[room_jid] = nick
self.contacts[room_jid] = {} gajim.gc_contacts[self.account][room_jid] = {}
self.subjects[room_jid] = '' self.subjects[room_jid] = ''
self.room_creation[room_jid] = time.time() self.room_creation[room_jid] = time.time()
self.nick_hits[room_jid] = [] self.nick_hits[room_jid] = []
@ -1020,7 +1020,7 @@ class GroupchatWindow(chat.Chat):
nick = model[iter][1] nick = model[iter][1]
fjid = gajim.construct_fjid(room_jid, nick) fjid = gajim.construct_fjid(room_jid, nick)
if not self.plugin.windows[self.account]['chats'].has_key(fjid): if not self.plugin.windows[self.account]['chats'].has_key(fjid):
show = self.contacts[room_jid][nick].show show = gajim.gc_contacts[self.account][room_jid][nick].show
u = Contact(jid = fjid, name = nick, groups = ['none'], u = Contact(jid = fjid, name = nick, groups = ['none'],
show = show, sub = 'none') show = show, sub = 'none')
self.plugin.roster.new_chat(u, self.account) self.plugin.roster.new_chat(u, self.account)
@ -1038,7 +1038,7 @@ class GroupchatWindow(chat.Chat):
model = widget.get_model() model = widget.get_model()
iter = model.get_iter(path) iter = model.get_iter(path)
nick = model[iter][1] nick = model[iter][1]
if not nick in self.contacts[room_jid]: #it's a group if not nick in gajim.gc_contacts[self.account][room_jid]: #it's a group
if x < 20: # first cell in 1st column (the arrow SINGLE clicked) if x < 20: # first cell in 1st column (the arrow SINGLE clicked)
if (widget.row_expanded(path)): if (widget.row_expanded(path)):
widget.collapse_row(path) widget.collapse_row(path)
@ -1066,7 +1066,7 @@ class GroupchatWindow(chat.Chat):
nick = model[iter][1] nick = model[iter][1]
fjid = gajim.construct_fjid(room_jid, nick) fjid = gajim.construct_fjid(room_jid, nick)
if not self.plugin.windows[self.account]['chats'].has_key(fjid): if not self.plugin.windows[self.account]['chats'].has_key(fjid):
show = self.contacts[room_jid][nick].show show = gajim.gc_contacts[self.account][room_jid][nick].show
u = Contact(jid = fjid, name = nick, groups = ['none'], show = show, u = Contact(jid = fjid, name = nick, groups = ['none'], show = show,
sub = 'none') sub = 'none')
self.plugin.roster.new_chat(u, self.account) self.plugin.roster.new_chat(u, self.account)