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

move > 1 < 2 jargon about connected acct to where it belogs [common/gajim] try to use that from now one please.

This commit is contained in:
Nikos Kouremenos 2006-10-02 10:42:59 +00:00
parent f4a7ecbad0
commit 962c571adb
3 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/connection.py
View File

@ -1,19 +1,11 @@
## common/connection.py
##
## Contributors for this file:
## - Yann Le Boulanger <asterix@lagaule.org>
## - Nikos Kouremenos <kourem@gmail.com>
## - Dimitur Kirov <dkirov@gmail.com>
## - Travis Shirk <travis@pobox.com>
##
## Copyright (C) 2003-2004 Yann Le Boulanger <asterix@lagaule.org>
## Vincent Hanquez <tab@snarc.org>
## Copyright (C) 2005 Yann Le Boulanger <asterix@lagaule.org>
## Vincent Hanquez <tab@snarc.org>
## Nikos Kouremenos <kourem@gmail.com>
## Dimitur Kirov <dkirov@gmail.com>
## Travis Shirk <travis@pobox.com>
## Norman Rasmussen <norman@rasmussen.co.za>
## Copyright (C) 2003-2004 Vincent Hanquez <tab@snarc.org>
## Copyright (C) 2003-2006 Yann Le Boulanger <asterix@lagaule.org>
## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
## Copyright (C) 2005-2006 Dimitur Kirov <dkirov@gmail.com>
## Copyright (C) 2005-2006 Travis Shirk <travis@pobox.com>
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published
@ -129,8 +121,8 @@ class Connection(ConnectionHandlers):
def _disconnectedReconnCB(self):
'''Called when we are disconnected'''
gajim.log.debug('disconnectedReconnCB')
if self.connected > 1:
# we cannot change our status to offline or connectiong
if gajim.account_is_connected(self):
# we cannot change our status to offline or connecting
# after we auth to server
self.old_show = STATUS_LIST[self.connected]
self.connected = 0
@ -458,7 +450,7 @@ class Connection(ConnectionHandlers):
# END connect
def quit(self, kill_core):
if kill_core and self.connected > 1:
if kill_core and gajim.account_is_connected(self):
self.disconnect(on_purpose = True)
def get_privacy_lists(self):
@ -1116,7 +1108,7 @@ class Connection(ConnectionHandlers):
# as a class property as pass it as an argument
def _on_unregister_account_connect(con):
self.on_connect_auth = None
if self.connected > 1:
if gajim.account_is_connected(self):
hostname = gajim.config.get_per('accounts', self.name, 'hostname')
iq = common.xmpp.Iq(typ = 'set', to = hostname)
q = iq.setTag(common.xmpp.NS_REGISTER + ' query').setTag('remove')

13
src/common/gajim.py
View File

@ -207,8 +207,8 @@ def get_number_of_connected_accounts(accounts_list = None):
accounts = connections.keys()
else:
accounts = accounts_list
for acct in accounts:
if connections[acct].connected > 1:
for account in accounts:
if account_is_connected(account):
connected_accounts = connected_accounts + 1
return connected_accounts
@ -260,6 +260,15 @@ def jid_is_transport(jid):
return True
return False
def account_is_connected(account):
if connections[account].connected > 1: # 0 is offline, 1 is connecting
return True
else:
return False
def account_is_disconnected(account):
return not account_is_connected(account)
def get_jid_from_account(account_name):
'''return the jid we use in the given account'''
name = config.get_per('accounts', account_name, 'name')

31
src/roster_window.py
View File

@ -56,7 +56,7 @@ C_SECPIXBUF, # secondary_pixbuf (holds avatar or padlock)
) = range(7)
class RosterWindow:
'''Class for main window of gtkgui interface'''
'''Class for main window of the GTK+ interface'''
def get_account_iter(self, name):
model = self.tree.get_model()
@ -393,8 +393,8 @@ class RosterWindow:
return
if contact.jid in gajim.newly_added[account]:
return
if contact.jid.find('@') < 1 and gajim.connections[account].connected > 1:
# It's an agent
if gajim.jid_is_transport(contact.jid) and gajim.account_is_connected(
account): # It's an agent
return
if contact.jid in gajim.to_be_removed[account]:
gajim.to_be_removed[account].remove(contact.jid)
@ -410,7 +410,7 @@ class RosterWindow:
showOffline = gajim.config.get('showoffline')
if (contact.show in ('offline', 'error') or hide) and \
not showOffline and (not _('Transports') in contact.groups or \
gajim.connections[account].connected < 2) and \
gajim.account_is_disconnected(account)) and \
len(gajim.events.get_events(account, contact.jid, ['chat'])) == 0:
self.remove_contact(contact, account)
else:
@ -836,7 +836,7 @@ class RosterWindow:
elif connected_accounts == 1: # user has only one account
for account in gajim.connections:
if gajim.connections[account].connected > 1: # THE connected account
if gajim.account_is_connected(account): # THE connected account
# gc
self.add_bookmarks_list(gc_sub_menu, account)
# add
@ -879,7 +879,7 @@ class RosterWindow:
connected_accounts_with_vcard = []
for account in gajim.connections:
if gajim.connections[account].connected > 1 and \
if gajim.account_is_connected(account) and \
gajim.connections[account].vcard_supported:
connected_accounts_with_vcard.append(account)
if len(connected_accounts_with_vcard) > 1:
@ -1714,7 +1714,6 @@ class RosterWindow:
jid = model[iter][C_JID].decode('utf-8')
path = model.get_path(iter)
account = model[iter][C_ACCOUNT].decode('utf-8')
is_connected = gajim.connections[account].connected > 1
contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
menu = gtk.Menu()
@ -1723,7 +1722,8 @@ class RosterWindow:
item.set_image(icon)
menu.append(item)
show = contact.show
if (show != 'offline' and show != 'error') or not is_connected:
if (show != 'offline' and show != 'error') or\
gajim.account_is_disconnected(account):
item.set_sensitive(False)
item.connect('activate', self.on_agent_logging, jid, None, account)
@ -1731,7 +1731,8 @@ class RosterWindow:
icon = gtk.image_new_from_stock(gtk.STOCK_NO, gtk.ICON_SIZE_MENU)
item.set_image(icon)
menu.append(item)
if show in ('offline', 'error') or not is_connected:
if show in ('offline', 'error') or gajim.account_is_disconnected(
account):
item.set_sensitive(False)
item.connect('activate', self.on_agent_logging, jid, 'unavailable',
account)
@ -1744,7 +1745,7 @@ class RosterWindow:
item.set_image(icon)
menu.append(item)
item.connect('activate', self.on_edit_agent, contact, account)
if not is_connected:
if gajim.account_is_disconnected(account):
item.set_sensitive(False)
item = gtk.ImageMenuItem(_('_Rename'))
@ -1756,7 +1757,7 @@ class RosterWindow:
item.set_image(img)
menu.append(item)
item.connect('activate', self.on_rename, iter, path)
if not is_connected:
if gajim.account_is_disconnected(account):
item.set_sensitive(False)
item = gtk.ImageMenuItem(_('_Remove from Roster'))
@ -1764,7 +1765,7 @@ class RosterWindow:
item.set_image(icon)
menu.append(item)
item.connect('activate', self.on_remove_agent, [(contact, account)])
if not is_connected:
if gajim.account_is_disconnected(account):
item.set_sensitive(False)
event_button = gtkgui_helpers.get_possible_button_event(event)
@ -2266,7 +2267,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
if gc_control.account == account:
gajim.connections[account].send_gc_status(gc_control.nick,
gc_control.room_jid, status, txt)
if gajim.connections[account].connected > 1:
if gajim.account_is_connected(account):
if status == 'online' and gajim.interface.sleeper.getState() != \
common.sleepy.STATE_UNKNOWN:
gajim.sleeper_state[account] = 'online'
@ -2351,7 +2352,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
if status == 'invisible':
bug_user = False
for acct in accounts:
if connected_accounts < 1 or gajim.connections[acct].connected > 1:
if connected_accounts < 1 or gajim.account_is_connected(account):
if not gajim.config.get_per('accounts', acct,
'sync_with_global_status'):
continue
@ -2383,7 +2384,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
# or no account is connected and we want to connect with new show and status
if not global_sync_connected_accounts > 0 or \
gajim.connections[acct].connected > 1:
gajim.account_is_connected(account):
self.send_status(acct, status, message)
self.update_status_combobox()