X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-ui%2Fzssh.c;h=b49d3328e33cac0b71ba6ee75cb624a620eb8a60;hb=a8413a9b36426b8d9ac57ddf13779fe6b51d949c;hp=a38a9d90f480686ee73a9efb9f7c4b2aff4cf7c1;hpb=a389a24eb118f73094d2e0d27169bb1b5c4201b8;p=catta

diff --git a/avahi-ui/zssh.c b/avahi-ui/zssh.c
index a38a9d9..b49d332 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>
 
@@ -42,10 +43,10 @@ int main(int argc, char*argv[]) {
     gtk_init(&argc, &argv);
 
     if (g_str_has_suffix(argv[0], "zvnc")) {
-        d = aui_service_dialog_new("Choose VNC server");
+        d = aui_service_dialog_new("Choose VNC server", NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
         aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_rfb._tcp", NULL);
     } else {
-        d = aui_service_dialog_new("Choose SSH server");
+        d = aui_service_dialog_new("Choose SSH server", NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
         aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_ssh._tcp", NULL);
     }
         
@@ -54,7 +55,7 @@ int main(int argc, char*argv[]) {
 
     gtk_window_present(GTK_WINDOW(d));
 
-    if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK) {
+    if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_ACCEPT) {
         char a[AVAHI_ADDRESS_STR_MAX], *u = NULL, *n = NULL;
         char *h = NULL, *t = NULL;
         const AvahiStringList *txt;
@@ -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);