From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 13 Oct 2007 19:06:35 +0000 (+0200)
Subject: Merge commit 'pubserv/master'
X-Git-Tag: 1.0~25
X-Git-Url: http://git.dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=a9477b339d8edadb9eb109718e3acffc178d65c6;hp=c0d0c66baba47a19c5fe6e459613702d6ca18292

Merge commit 'pubserv/master'
---

diff --git a/clients/gtk2/hublist-xml.c b/clients/gtk2/hublist-xml.c
index d72291d..46a53ce 100644
--- a/clients/gtk2/hublist-xml.c
+++ b/clients/gtk2/hublist-xml.c
@@ -119,6 +119,8 @@ int pubhubxmlhandler(int op, char *buf, size_t len)
 		    type = G_TYPE_STRING;
 		else if(!strcmp(stype, "int"))
 		    type = G_TYPE_INT;
+		else if(!strcmp(stype, "percent"))
+		    type = G_TYPE_INT;
 		else if(!strcmp(stype, "bytes"))
 		    type = G_TYPE_INT64;
 	    }
diff --git a/clients/gtk2/reslist.desc b/clients/gtk2/reslist.desc
index 10ab08f..138b2f2 100644
--- a/clients/gtk2/reslist.desc
+++ b/clients/gtk2/reslist.desc
@@ -15,7 +15,7 @@
 				$tvcol title: "Hash" text: 5 sortcol: 5
 			end
 		end
-		:hbox
+		:hbtnbox layout: END
 			$sbtn name: reload stock: REFRESH sig: clicked var: y
 			$sbtn name: delete stock: DELETE sig: clicked sensitive: FALSE var: y
 			$btn name: search label: "_Search for hash" sig: clicked sensitive: FALSE var: y
diff --git a/clients/gui-shell/dsh.c b/clients/gui-shell/dsh.c
index 1922aaf..9aa6a8e 100644
--- a/clients/gui-shell/dsh.c
+++ b/clients/gui-shell/dsh.c
@@ -396,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"));
@@ -403,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);
@@ -419,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();
     }