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

use of pychecker (http://pychecker.sourceforge.net/) on gajim.py, other files will follow

Browse source
This commit is contained in:
Yann Leboulanger 2005-07-19 19:41:23 +00:00
parent d11e91a00c
commit 517a9c6850
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/gajim.py
View file

@ -31,7 +31,6 @@ except RuntimeError, msg:
print 'Gajim needs Xserver to run. Exiting...' print 'Gajim needs Xserver to run. Exiting...'
sys.exit() sys.exit()
import gtk.glade import gtk.glade
import pango
import gobject import gobject
import os import os
import sre import sre
@ -338,7 +337,6 @@ class Interface:
elif self.windows[account]['gc'].has_key(ji): elif self.windows[account]['gc'].has_key(ji):
#it is a groupchat presence #it is a groupchat presence
#TODO: upgrade the chat instances (for pm) #TODO: upgrade the chat instances (for pm)
fjid = array[0] + '/' + array[3]
self.windows[account]['gc'][ji].chg_contact_status(ji, resource, self.windows[account]['gc'][ji].chg_contact_status(ji, resource,
array[1], array[2], array[6], array[7], array[8], array[9], array[1], array[2], array[6], array[7], array[8], array[9],
array[10], array[11], array[12], account) array[10], array[11], array[12], account)
@ -437,9 +435,9 @@ class Interface:
gc = gcs[jid] gc = gcs[jid]
tv = gc.list_treeview[jid] tv = gc.list_treeview[jid]
model = tv.get_model() model = tv.get_model()
iter = gc.get_contact_iter(jid, nick) i = gc.get_contact_iter(jid, nick)
if iter: if i:
show = model.get_value(iter, 3) show = model.get_value(i, 3)
else: else:
show = 'offline' show = 'offline'
u = Contact(jid = fjid, name = nick, groups = ['none'], u = Contact(jid = fjid, name = nick, groups = ['none'],
@ -504,7 +502,7 @@ class Interface:
dialogs.InformationDialog(_('Contact "%s" removed subscription from you') % jid, dialogs.InformationDialog(_('Contact "%s" removed subscription from you') % jid,
_('You will always see him as offline.')).get_response() _('You will always see him as offline.')).get_response()
if self.remote and self.remote.is_enabled(): if self.remote and self.remote.is_enabled():
self.remote.raise_signal('Unsubscribed', (account, array)) self.remote.raise_signal('Unsubscribed', (account, jid))
def handle_event_agent_info(self, account, array): def handle_event_agent_info(self, account, array):
#('AGENT_INFO', account, (agent, identities, features, items)) #('AGENT_INFO', account, (agent, identities, features, items))
@ -837,6 +835,7 @@ class Interface:
return True # renew timeout (loop for ever) return True # renew timeout (loop for ever)
except KeyboardInterrupt: except KeyboardInterrupt:
sys.exit() sys.exit()
return False
def save_config(self): def save_config(self):
parser.write() parser.write()
@ -847,14 +846,14 @@ class Interface:
if not hasattr(self, 'remote') or not self.remote: if not hasattr(self, 'remote') or not self.remote:
try: try:
self.remote = remote_control.Remote(self) self.remote = remote_control.Remote(self)
except remote_control.DbusNotSupported, e: except remote_control.DbusNotSupported:
if not is_initial: if not is_initial:
dialog = dialogs.ErrorDialog(_("D-Bus is not present on this machine"),_("Please install dbus if you want to use remote control.")).get_response() dialogs.ErrorDialog(_("D-Bus is not present on this machine"),_("Please install dbus if you want to use remote control.")).get_response()
self.remote = None self.remote = None
return False return False
except remote_control.SessionBusNotPresent, e: except remote_control.SessionBusNotPresent:
if not is_initial: if not is_initial:
dialog = dialogs.ErrorDialog(_("Session bus is not started"),_("Your system is running without session bus daemon. \n See: for instructions how to do it.")).get_response() dialogs.ErrorDialog(_("Session bus is not started"),_("Your system is running without session bus daemon. \n See: for instructions how to do it.")).get_response()
self.remote = None self.remote = None
return False return False
else: else:
@ -941,7 +940,7 @@ class Interface:
gajim.config.get('autoxatime') * 60) gajim.config.get('autoxatime') * 60)
self.systray_enabled = False self.systray_enabled = False
try: try:
import egg.trayicon as trayicon # use gnomepythonextras trayicon import egg.trayicon # use gnomepythonextras trayicon
except: except:
try: try:
import trayicon # use yann's import trayicon # use yann's