HIGify avahi-ui, make the API more GTK conform

[catta] / avahi-ui / zssh.c

diff --git a/avahi-ui/zssh.c b/avahi-ui/zssh.c
index e4cf16efa0a25e4a2b43186a2db9c02499d20807..b49d3328e33cac0b71ba6ee75cb624a620eb8a60 100644 (file)
--- 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,17 +55,20 @@ int main(int argc, char*argv[]) {
 
     gtk_window_present(GTK_WINDOW(d));
 
-    if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK) {
-        char a[AVAHI_ADDRESS_STR_MAX], *u = NULL;
+    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;
         
         t = g_strdup(aui_service_dialog_get_service_type(AUI_SERVICE_DIALOG(d)));
+        n = g_strdup(aui_service_dialog_get_service_name(AUI_SERVICE_DIALOG(d)));
         
         if (avahi_nss_support())
             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];
@@ -77,6 +81,7 @@ int main(int argc, char*argv[]) {
             
         } else {
             char p[16];
+            
             snprintf(p, sizeof(p), "%u", aui_service_dialog_get_port(AUI_SERVICE_DIALOG(d)));
             
             for (txt = aui_service_dialog_get_txt_data(AUI_SERVICE_DIALOG(d)); txt; txt = txt->next) {
@@ -93,21 +98,36 @@ int main(int argc, char*argv[]) {
             }
 
             gtk_widget_destroy(d);
-            
+
             if (u) {
                 g_print("ssh -p %s -l %s %s\n", p, u, h);
-                execlp("ssh", "ssh", "-p", p, "-l", u, h, NULL); 
+
+                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); 
+                    execlp("gnome-terminal", "gnome-terminal", "-t", n, "-x", "ssh", "-p", p, "-l", u, h, NULL);
+                    execlp("xterm", "xterm", "-T", n, "-e", "ssh", "-p", p, "-l", u, h, NULL);
+                }
             } else {
                 g_print("ssh -p %s %s\n", p, h);
-                execlp("ssh", "ssh", "-p", p, h, NULL); 
+                
+                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); 
+                    execlp("gnome-terminal", "gnome-terminal", "-t", n, "-x", "ssh", "-p", p, h, NULL);
+                    execlp("xterm", "xterm", "-T", n, "-e", "ssh", "-p", p, h, NULL);
+                }
             }
         }
 
-        g_warning("execlp() failed: %s", strerror(errno));
+        g_warning("execlp() failed: %s\n", strerror(errno));
 
         g_free(h);
         g_free(u);
         g_free(t);
+        g_free(n);
         
     } else {
         gtk_widget_destroy(d);