#include <string.h>
#include <unistd.h>
#include <errno.h>
+#include <stdlib.h>
#include <gtk/gtk.h>
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);
}
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;
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];
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);
} 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);
}
}
- g_warning("execlp() failed: %s", strerror(errno));
+ g_warning("execlp() failed: %s\n", strerror(errno));
g_free(h);
g_free(u);