diff options
| author | Sebastien Estienne <sebastien.estienne@gmail.com> | 2006-08-06 23:52:31 +0000 |
|---|---|---|
| committer | Sebastien Estienne <sebastien.estienne@gmail.com> | 2006-08-06 23:52:31 +0000 |
| commit | 27c6fade238336c61a5a01d22fe767bf664ca010 (patch) | |
| tree | ab199c4381c7753a23c89289a698f15351764e96 /plugins | |
| parent | d9313c80245a75e3b023a729eacec454e580b7a8 (diff) | |
display error messages when something goes wrong in plugins
git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@115 3be567f1-68ff-0310-b24a-ad7cc433fd2f
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Makefile.am | 29 | ||||
| -rw-r--r-- | plugins/ekiga.py.in (renamed from plugins/ekiga.py) | 2 | ||||
| -rw-r--r-- | plugins/gconfterminal.py.in (renamed from plugins/gconfterminal.py) | 4 | ||||
| -rw-r--r-- | plugins/nautilus.py.in (renamed from plugins/nautilus.py) | 0 | ||||
| -rw-r--r-- | plugins/xvncviewer.py.in (renamed from plugins/xvncviewer.py) | 2 |
5 files changed, 32 insertions, 5 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index d0b4e7b..893cc07 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,10 +1,37 @@ pluginsdir = $(PLUGINSDIR) +plugins = \ + gconfterminal.py.in \ + nautilus.py.in \ + xvncviewer.py.in \ + ekiga.py.in + plugins_DATA = \ gconfterminal.py \ nautilus.py \ xvncviewer.py \ ekiga.py +gconfterminal.py: gconfterminal.py.in + sed \ + -e 's,@toolsdir\@,$(TOOLSDIR),g' \ + $< > $@ + +nautilus.py: nautilus.py.in + sed \ + -e 's,@toolsdir\@,$(TOOLSDIR),g' \ + $< > $@ + +xvncviewer.py: xvncviewer.py.in + sed \ + -e 's,@toolsdir\@,$(TOOLSDIR),g' \ + $< > $@ + +ekiga.py: ekiga.py.in + sed \ + -e 's,@toolsdir\@,$(TOOLSDIR),g' \ + $< > $@ + +EXTRA_DIST = $(plugins) -EXTRA_DIST = $(plugins_DATA) +CLEANFILES = $(plugins_DATA) diff --git a/plugins/ekiga.py b/plugins/ekiga.py.in index 7b920e4..26b37fa 100644 --- a/plugins/ekiga.py +++ b/plugins/ekiga.py.in @@ -25,7 +25,7 @@ class plugin_ekiga: if use_host_names == True: address = hostname print "connecting using ekiga" - cmdline = ["ekiga"] + cmdline = ["@toolsdir@/exec_wrapper", "ekiga"] if stype == "_sip._udp": cmdline += ["-c", "sip:%s:%s" % (address, port)] else: diff --git a/plugins/gconfterminal.py b/plugins/gconfterminal.py.in index 92b9abb..8dbaef8 100644 --- a/plugins/gconfterminal.py +++ b/plugins/gconfterminal.py.in @@ -113,9 +113,9 @@ class plugin_gnometerminal: if stype == "_ssh._tcp": - scheme = "ssh -X" + scheme = "@toolsdir@/exec_wrapper ssh -X" else: - scheme = "sftp" + scheme = "@toolsdir@/exec_wrapper sftp" if username == None: return elif username != "": diff --git a/plugins/nautilus.py b/plugins/nautilus.py.in index 6783bbe..6783bbe 100644 --- a/plugins/nautilus.py +++ b/plugins/nautilus.py.in diff --git a/plugins/xvncviewer.py b/plugins/xvncviewer.py.in index ee51d54..a6e614d 100644 --- a/plugins/xvncviewer.py +++ b/plugins/xvncviewer.py.in @@ -23,7 +23,7 @@ class plugin_xvncviewer: def connect(self, use_host_names, name, stype, hostname, address, port, txts): print "connecting using xvncviewer" - cmdline = ["xvncviewer", "-xrm", "*passwordDialog:true", hostname ] + cmdline = ["@toolsdir@/exec_wrapper", "xvncviewer", "-xrm", "*passwordDialog:true", hostname ] print cmdline pid = subprocess.Popen(cmdline, close_fds=True).pid |