From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 1 Sep 2007 12:15:39 +0000 (+0200)
Subject: Allow connecting to any server in dsh.
X-Git-Tag: 1.0~39
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=a0ca560ebe8e201c8c3c29f3168eae45fcd55beb;p=doldaconnect.git

Allow connecting to any server in dsh.
---

diff --git a/clients/gui-shell/dsh.c b/clients/gui-shell/dsh.c
index 332e0df..62cf0e4 100644
--- a/clients/gui-shell/dsh.c
+++ b/clients/gui-shell/dsh.c
@@ -54,6 +54,7 @@ struct trinfo {
 void updatewrite(void);
 
 int remote = 0;
+char *server;
 GtkStatusIcon *tray;
 pid_t dpid = 0, dcpid = 0;
 int connected = 0;
@@ -378,7 +379,7 @@ void updatewrite(void)
 
 void connectdc(void)
 {
-    if((dcfd = dc_connect(remote?NULL:dc_srv_local)) < 0) {
+    if((dcfd = dc_connect(server)) < 0) {
 	msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not connect to server: %s"), strerror(errno));
 	exit(1);
     }
@@ -543,14 +544,20 @@ int main(int argc, char **argv)
     textdomain(PACKAGE);
     signal(SIGCHLD, sighandler);
     dc_init();
+    server = dc_srv_local;
     gtk_init(&argc, &argv);
 #ifdef HAVE_NOTIFY
     notify_init("Dolda Connect");
 #endif
-    while((c = getopt(argc, argv, "rh")) != -1) {
+    while((c = getopt(argc, argv, "rhs:")) != -1) {
 	switch(c) {
 	case 'r':
 	    remote = 1;
+	    server = NULL;
+	    break;
+	case 's':
+	    remote = 1;
+	    server = optarg;
 	    break;
 	case 'h':
 	    printf("usage: doldacond-shell [-hr]\n");