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

coding style

Browse source
This commit is contained in:
Denis Fomin 2010-12-06 17:52:32 +03:00
parent 8a47134bcd
commit 4a7d1933a0
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/ftp_manager/ftp_manager.py
View file

@ -36,6 +36,7 @@ from dialogs import WarningDialog, HigDialog
from plugins.gui import GajimPluginConfigDialog from plugins.gui import GajimPluginConfigDialog
from common import i18n from common import i18n
class FtpManager(GajimPlugin): class FtpManager(GajimPlugin):
@log_calls('FtpManagerPlugin') @log_calls('FtpManagerPlugin')
@ -48,7 +49,7 @@ class FtpManager(GajimPlugin):
self.pl_menuitem = gajim.interface.roster.xml.get_object( self.pl_menuitem = gajim.interface.roster.xml.get_object(
'plugins_menuitem') 'plugins_menuitem')
self.id_ = self.pl_menuitem.connect_after('activate', self.on_activate) self.id_ = self.pl_menuitem.connect_after('activate', self.on_activate)
if gajim.interface.instances.has_key('plugins'): if 'plugins' in gajim.interface.instances:
self.on_activate(None) self.on_activate(None)
@log_calls('FtpManagerPlugin') @log_calls('FtpManagerPlugin')
@ -61,7 +62,7 @@ class FtpManager(GajimPlugin):
del self.ftp del self.ftp
def on_activate(self, widget): def on_activate(self, widget):
if not gajim.interface.instances.has_key('plugins'): if 'plugins' not in gajim.interface.instances:
return return
self.installed_plugins_model = gajim.interface.instances[ self.installed_plugins_model = gajim.interface.instances[
'plugins'].installed_plugins_model 'plugins'].installed_plugins_model
@ -186,7 +187,8 @@ class FtpManager(GajimPlugin):
if plugin: if plugin:
if plugin.active and plugin.name != self.name: if plugin.active and plugin.name != self.name:
is_active = True is_active = True
gobject.idle_add(gajim.plugin_manager.deactivate_plugin ,plugin) gobject.idle_add(gajim.plugin_manager.deactivate_plugin,
plugin)
gajim.plugin_manager.plugins.remove(plugin) gajim.plugin_manager.plugins.remove(plugin)
model = self.installed_plugins_model model = self.installed_plugins_model
@ -371,7 +373,6 @@ class Ftp(threading.Thread):
except Exception, e: except Exception, e:
self.window.emit('error_signal', str(e)) self.window.emit('error_signal', str(e))
def handleDownload(self, block): def handleDownload(self, block):
self.buffer_.write(block) self.buffer_.write(block)