X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=clients%2Fgui-shell%2Fdsh.c;h=40ee5467ac1645defa89f245b37105e6f3ea1c49;hb=8af979f318c0e3d1d00a35996f6b5fecb055ac33;hp=332e0df265204e748978f9734cef963d3d30942b;hpb=2c16e7a55f80f0fc8e33af6f932dfe3ff6306688;p=doldaconnect.git

diff --git a/clients/gui-shell/dsh.c b/clients/gui-shell/dsh.c
index 332e0df..40ee546 100644
--- a/clients/gui-shell/dsh.c
+++ b/clients/gui-shell/dsh.c
@@ -48,12 +48,14 @@ struct trinfo {
     int ostate;
     int opos, spos, speed;
     time_t lastprog;
+    int warned;
     double sprog;
 };
 
 void updatewrite(void);
 
 int remote = 0;
+char *server;
 GtkStatusIcon *tray;
 pid_t dpid = 0, dcpid = 0;
 int connected = 0;
@@ -287,11 +289,14 @@ void updatetrinfo(void)
 	    if(tri->opos != tr->curpos) {
 		tri->opos = tr->curpos;
 		tri->lastprog = now;
+		tri->warned = 0;
 	    }
-#ifdef NOTIFY
-	    if((tr->state = DC_TRNS_MAIN) && (now - tri->lastprog > 600)) {
-		if(dcpid == 0)
+#ifdef HAVE_NOTIFY
+	    if((tr->state = DC_TRNS_MAIN) && (now - tri->lastprog > 600) && !tri->warned) {
+		if(dcpid == 0) {
 		    notify(&trnote, "transfer.error", _("Transfer stalled"), _("The transfer of %ls from %ls has not made progress for 10 minutes"), getfilename(tr->path), tr->peernick);
+		    tri->warned = 1;
+		}
 	    }
 #endif
 	    if((tr->state == DC_TRNS_MAIN) && (dnow - tri->sprog > 10)) {
@@ -378,7 +383,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);
     }
@@ -391,6 +396,7 @@ void startdaemon(void)
 {
     char pf[1024];
     int pfd[2], i;
+    sigset_t ss;
     
     if(getenv("HOME") != NULL)
 	snprintf(pf, sizeof(pf), "%s/.doldacond.pid", getenv("HOME"));
@@ -398,7 +404,11 @@ void startdaemon(void)
 	snprintf(pf, sizeof(pf), "%s/.doldacond.pid", getpwuid(getuid())->pw_dir);
     if(access(pf, F_OK) || !running(pf)) {
 	pipe(pfd);
+	sigemptyset(&ss);
+	sigaddset(&ss, SIGCHLD);
+	sigprocmask(SIG_BLOCK, &ss, NULL);
 	if((dpid = fork()) == 0) {
+	    sigprocmask(SIG_UNBLOCK, &ss, NULL);
 	    dup2(pfd[1], 2);
 	    for(i = 3; i < FD_SETSIZE; i++)
 		close(i);
@@ -414,6 +424,7 @@ void startdaemon(void)
 	create_start_wnd();
 	gtk_widget_show(start_wnd);
 	gtk_status_icon_set_tooltip(tray, _("Starting..."));
+	sigprocmask(SIG_UNBLOCK, &ss, NULL);
     } else {
 	connectdc();
     }
@@ -543,19 +554,29 @@ 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, "Vrhs:")) != -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");
 	    printf("\t-h\tDisplay this help message\n");
 	    printf("\t-r\tConnect to a remote host\n");
+	    printf("\t-V\tDisplay version info and exit\n");
+	    exit(0);
+	case 'V':
+	    printf("%s", RELEASEINFO);
 	    exit(0);
 	default:
 	    fprintf(stderr, "usage: doldacond-shell [-hr]\n");