fixing #256
This commit is contained in:
parent
33b125f42e
commit
27723d1279
4 changed files with 11 additions and 11 deletions
|
@ -1390,7 +1390,7 @@ class Service_registration_window:
|
||||||
send registration info to the core'''
|
send registration info to the core'''
|
||||||
for name in self.entries.keys():
|
for name in self.entries.keys():
|
||||||
self.infos[name] = self.entries[name].get_text()
|
self.infos[name] = self.entries[name].get_text()
|
||||||
user1 = User(self.service, self.service, ['Agents'], 'offline',
|
user1 = User(self.service, self.service, ['Transports'], 'offline',
|
||||||
'offline', 'from', '', '', 0, '')
|
'offline', 'from', '', '', 0, '')
|
||||||
self.plugin.roster.contacts[self.account][self.service] = [user1]
|
self.plugin.roster.contacts[self.account][self.service] = [user1]
|
||||||
self.plugin.roster.add_user_to_roster(self.service, self.account)
|
self.plugin.roster.add_user_to_roster(self.service, self.account)
|
||||||
|
|
|
@ -244,7 +244,7 @@ class Add_new_contact_window:
|
||||||
jid_agents = []
|
jid_agents = []
|
||||||
for j in self.plugin.roster.contacts[account]:
|
for j in self.plugin.roster.contacts[account]:
|
||||||
user = self.plugin.roster.contacts[account][j][0]
|
user = self.plugin.roster.contacts[account][j][0]
|
||||||
if 'Agents' in user.groups:
|
if 'Transports' in user.groups:
|
||||||
jid_agents.append(j)
|
jid_agents.append(j)
|
||||||
for a in jid_agents:
|
for a in jid_agents:
|
||||||
if a.find('aim') > -1:
|
if a.find('aim') > -1:
|
||||||
|
@ -279,7 +279,7 @@ class Add_new_contact_window:
|
||||||
liststore = gtk.ListStore(str)
|
liststore = gtk.ListStore(str)
|
||||||
self.group_comboboxentry.set_model(liststore)
|
self.group_comboboxentry.set_model(liststore)
|
||||||
for g in self.plugin.roster.groups[account].keys():
|
for g in self.plugin.roster.groups[account].keys():
|
||||||
if g != 'not in the roster' and g != 'Agents':
|
if g != 'not in the roster' and g != 'Transports':
|
||||||
self.group_comboboxentry.append_text(g)
|
self.group_comboboxentry.append_text(g)
|
||||||
|
|
||||||
self.xml.signal_autoconnect(self)
|
self.xml.signal_autoconnect(self)
|
||||||
|
|
|
@ -110,12 +110,12 @@ class Roster_window:
|
||||||
users = self.contacts[account][jid]
|
users = self.contacts[account][jid]
|
||||||
user = users[0]
|
user = users[0]
|
||||||
if user.jid.find('@') <= 0: # if not '@' or '@' starts the jid ==> agent
|
if user.jid.find('@') <= 0: # if not '@' or '@' starts the jid ==> agent
|
||||||
user.groups = ['Agents']
|
user.groups = ['Transports']
|
||||||
elif user.groups == []:
|
elif user.groups == []:
|
||||||
user.groups.append('General')
|
user.groups.append('General')
|
||||||
|
|
||||||
if (user.show == 'offline' or user.show == 'error') and \
|
if (user.show == 'offline' or user.show == 'error') and \
|
||||||
not showOffline and not 'Agents' in user.groups and \
|
not showOffline and not 'Transports' in user.groups and \
|
||||||
not self.plugin.queues[account].has_key(user.jid):
|
not self.plugin.queues[account].has_key(user.jid):
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -137,7 +137,7 @@ class Roster_window:
|
||||||
self.tree.expand_row((model.get_path(iterG)[0]), False)
|
self.tree.expand_row((model.get_path(iterG)[0]), False)
|
||||||
|
|
||||||
typestr = 'user'
|
typestr = 'user'
|
||||||
if g == 'Agents':
|
if g == 'Transports':
|
||||||
typestr = 'agent'
|
typestr = 'agent'
|
||||||
|
|
||||||
model.append(iterG, (self.jabber_state_images[user.show], user.name,
|
model.append(iterG, (self.jabber_state_images[user.show], user.name,
|
||||||
|
@ -1307,9 +1307,9 @@ class Roster_window:
|
||||||
return 0
|
return 0
|
||||||
type = model.get_value(iter1, 2)
|
type = model.get_value(iter1, 2)
|
||||||
if type == 'group':
|
if type == 'group':
|
||||||
if name1 == 'Agents':
|
if name1 == 'Transports':
|
||||||
return 1
|
return 1
|
||||||
if name2 == 'Agents':
|
if name2 == 'Transports':
|
||||||
return -1
|
return -1
|
||||||
if name1.lower() < name2.lower():
|
if name1.lower() < name2.lower():
|
||||||
return -1
|
return -1
|
||||||
|
@ -1355,7 +1355,7 @@ class Roster_window:
|
||||||
return
|
return
|
||||||
iter_group_source = model.iter_parent(iter_source)
|
iter_group_source = model.iter_parent(iter_source)
|
||||||
grp_source = model.get_value(iter_group_source, 3)
|
grp_source = model.get_value(iter_group_source, 3)
|
||||||
if grp_source == 'Agents' or grp_source == 'not in the roster':
|
if grp_source == 'Transports' or grp_source == 'not in the roster':
|
||||||
return
|
return
|
||||||
account = model.get_value(iter_dest, 4)
|
account = model.get_value(iter_dest, 4)
|
||||||
type_dest = model.get_value(iter_dest, 2)
|
type_dest = model.get_value(iter_dest, 2)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
## plugins/systray.py
|
## systray.py
|
||||||
##
|
##
|
||||||
## Gajim Team:
|
## Gajim Team:
|
||||||
## - Yann Le Boulanger <asterix@lagaule.org>
|
## - Yann Le Boulanger <asterix@lagaule.org>
|
||||||
|
@ -159,7 +159,7 @@ class Systray:
|
||||||
groups_menu = gtk.Menu()
|
groups_menu = gtk.Menu()
|
||||||
|
|
||||||
for group in self.plugin.roster.groups[account].keys():
|
for group in self.plugin.roster.groups[account].keys():
|
||||||
if group == 'Agents':
|
if group == 'Transports':
|
||||||
continue
|
continue
|
||||||
# at least one not offline or with errors in this group
|
# at least one not offline or with errors in this group
|
||||||
at_least_one = False
|
at_least_one = False
|
||||||
|
|
Loading…
Add table
Reference in a new issue