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 a0f44f365e8c0bc3e85a99849bb909d71659e287..5b286f3627fa88ae0d9793b1bd22d02dc4dd9afc 100644 (file)
--- 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);
            }