From: fredrik <fredrik@959494ce-11ee-0310-bf91-de5d638817bd>
Date: Mon, 4 Jun 2007 19:15:10 +0000 (+0000)
Subject: Merge commit 'refs/remotes/pubserv/master'
X-Git-Tag: 0.4~16
X-Git-Url: http://git.dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=48f7dc10b52a13f7c5dfc11e84b428c4e3e26550

Merge commit 'refs/remotes/pubserv/master'

Conflicts:

	clients/gtk2/main.c


git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@1062 959494ce-11ee-0310-bf91-de5d638817bd
---

diff --git a/clients/gtk2/main.c b/clients/gtk2/main.c
index a0f44f3..5b286f3 100644
--- a/clients/gtk2/main.c
+++ b/clients/gtk2/main.c
@@ -1085,7 +1085,7 @@ void handleresps(void)
 		dcdisconnected();
 	    } else {
 		tosbuf = 0x10; /* Minimum delay */
-		setsockopt(dcfd, SOL_IP, IP_TOS, &tosbuf, sizeof(tosbuf));
+		setsockopt(dcfd, IPPROTO_IP, IP_TOS, &tosbuf, sizeof(tosbuf));
 		updatesbar(_("Connected"));
 		dc_loginasync(connectas, 1, loginconv, logincallback, NULL);
 	    }