codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix __init__ to stop gtk being imported in the core

This commit is contained in:
Damien Churchill 2009-03-23 20:58:21 +00:00
parent 0ed166647d
commit 5c5bc9a713
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
deluge/plugins/execute/execute/__init__.py
View File

@ -25,10 +25,19 @@
from deluge.plugins.init import PluginInitBase from deluge.plugins.init import PluginInitBase
class CorePlugin(PluginInitBase): class CorePlugin(PluginInitBase):
from core import Core as _plugin_cls def __init__(self, plugin_name):
from core import Core as _plugin_cls
self._plugin_cls = _plugin_cls
super(CorePlugin, self).__init__(plugin_name)
class GtkUIPlugin(PluginInitBase): class GtkUIPlugin(PluginInitBase):
from gtkui import GtkUI as _plugin_cls def __init__(self, plugin_name):
from gtkui import GtkUI as _plugin_cls
self._plugin_cls = _plugin_cls
super(GtkUIPlugin, self).__init__(plugin_name)
class WebUIPlugin(PluginInitBase): class WebUIPlugin(PluginInitBase):
from webui import WebUI as _plugin_cls def __init__(self, plugin_name):
from webui import WebUI as _plugin_cls
self._plugin_cls = _plugin_cls
super(WebUIPlugin, self).__init__(plugin_name)

5
deluge/plugins/execute/execute/gtkui.py
View File

@ -23,6 +23,7 @@
# #
import os import os
import gtk
import pkg_resources import pkg_resources
from deluge.log import LOG as log from deluge.log import LOG as log
@ -31,8 +32,6 @@ from deluge.plugins.pluginbase import GtkPluginBase
import deluge.component as component import deluge.component as component
import deluge.common import deluge.common
gtk = None
EXECUTE_ID = 0 EXECUTE_ID = 0
EXECUTE_EVENT = 1 EXECUTE_EVENT = 1
EXECUTE_COMMAND = 2 EXECUTE_COMMAND = 2
@ -47,8 +46,6 @@ EVENTS = ["complete", "added"]
class ExecutePreferences(object): class ExecutePreferences(object):
def __init__(self, plugin): def __init__(self, plugin):
self.plugin = plugin self.plugin = plugin
global gtk
import gtk
def load(self): def load(self):
log.debug("Adding Execute Preferences page") log.debug("Adding Execute Preferences page")