summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-04-13 09:43:19 +0000
committerLennart Poettering <lennart@poettering.net>2007-04-13 09:43:19 +0000
commite29f1a1c940e76f1be19ed2c448c7c6257a5cbfe (patch)
tree37aa5c219ab5e9813ec4c2977522505585230200
parenta389a24eb118f73094d2e0d27169bb1b5c4201b8 (diff)
check both !isatty() and $DISPLAY before assuming we ar running from an X11 session
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1423 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
-rw-r--r--avahi-ui/zssh.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/avahi-ui/zssh.c b/avahi-ui/zssh.c
index a38a9d9..245fa4d 100644
--- a/avahi-ui/zssh.c
+++ b/avahi-ui/zssh.c
@@ -26,6 +26,7 @@
#include <string.h>
#include <unistd.h>
#include <errno.h>
+#include <stdlib.h>
#include <gtk/gtk.h>
@@ -66,6 +67,8 @@ int main(int argc, char*argv[]) {
h = g_strdup(aui_service_dialog_get_host_name(AUI_SERVICE_DIALOG(d)));
else
h = g_strdup(avahi_address_snprint(a, sizeof(a), aui_service_dialog_get_address(AUI_SERVICE_DIALOG(d))));
+
+ g_print("Connecting to '%s' ...\n", n);
if (avahi_domain_equal(t, "_rfb._tcp")) {
char p[AVAHI_DOMAIN_NAME_MAX+16];
@@ -99,7 +102,7 @@ int main(int argc, char*argv[]) {
if (u) {
g_print("ssh -p %s -l %s %s\n", p, u, h);
- if (isatty(0))
+ if (isatty(0) || !getenv("DISPLAY"))
execlp("ssh", "ssh", "-p", p, "-l", u, h, NULL);
else {
execlp("x-terminal-emulator", "x-terminal-emulator", "-T", n, "-e", "ssh", "-p", p, "-l", u, h, NULL);
@@ -109,7 +112,7 @@ int main(int argc, char*argv[]) {
} else {
g_print("ssh -p %s %s\n", p, h);
- if (isatty(0))
+ if (isatty(0) || !getenv("DISPLAY"))
execlp("ssh", "ssh", "-p", p, h, NULL);
else {
execlp("x-terminal-emulator", "x-terminal-emulator", "-T", n, "-e", "ssh", "-p", p, h, NULL);
@@ -119,7 +122,7 @@ int main(int argc, char*argv[]) {
}
}
- g_warning("execlp() failed: %s", strerror(errno));
+ g_warning("execlp() failed: %s\n", strerror(errno));
g_free(h);
g_free(u);