diff options
| author | Sebastien Estienne <sebastien.estienne@gmail.com> | 2006-08-06 19:41:26 +0000 |
|---|---|---|
| committer | Sebastien Estienne <sebastien.estienne@gmail.com> | 2006-08-06 19:41:26 +0000 |
| commit | fb1d693ccc3227b6da5010c28bfae582e11575db (patch) | |
| tree | a35456b5983e765ece604ccddaf3b283c6ae0494 | |
| parent | d716f075452aee0ea1dd17f3211ccb3087209f21 (diff) | |
* fix a bug causing the plugin to be loaded twice
* clean the gconfterminal plugin
git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@112 3be567f1-68ff-0310-b24a-ad7cc433fd2f
| -rw-r--r-- | plugins/gconfterminal.py | 11 | ||||
| -rwxr-xr-x | src/service-discovery-applet.in | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/plugins/gconfterminal.py b/plugins/gconfterminal.py index 54d8961..559476f 100644 --- a/plugins/gconfterminal.py +++ b/plugins/gconfterminal.py @@ -14,6 +14,10 @@ from sdapplet.pluginutils import * +import os +import pwd +import subprocess + try: import gettext gettext.bindtextdomain("service-discovery-applet", "/usr/share/locale") @@ -22,14 +26,11 @@ try: import pygtk pygtk.require('2.0') import gtk - import os - import pwd - import subprocess import gconf import gnome except ImportError, e: error_msg(_("A required python module is missing!\n%s") % (e)) - sys.exit() + os._exit() class plugin_gnometerminal: def __init__(self): @@ -125,7 +126,7 @@ class plugin_gnometerminal: cmdline = terminal.split(" ") cmdline.extend(sshline.split(" ")) print cmdline - pid = subprocess.Popen(cmdline).pid + subprocess.Popen(cmdline) def load(): return plugin_gnometerminal() diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in index 3fa8de4..8b979cf 100755 --- a/src/service-discovery-applet.in +++ b/src/service-discovery-applet.in @@ -91,8 +91,6 @@ class SDAGconf: self.gc_client.notify_add (self.gc_services, self.gc_services_cb) self.gc_client.notify_add (self.gc_options, self.gc_options_cb) - self.plugin = sdapplet.pluginloader.PluginLoader("@pluginsdir@") - try: for (stype, desc) in avahi.ServiceTypeDatabase.ServiceTypeDatabase().items(): if not self.gc_client.get("%s/%s" % (self.gc_services, stype)): |