X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=clients%2Fgnome-trans-applet%2Fconduit-dclib.c;h=c267db29e7d8afd34481294defb3a8d64dad9a47;hb=ccad23d3a684f97998ed781939af462227efb347;hp=2e8d0ae50854bef1678e6991d9cbe507a18a6dd7;hpb=6431aca05e3425df8ac4c2ed4e621d191f01425f;p=doldaconnect.git

diff --git a/clients/gnome-trans-applet/conduit-dclib.c b/clients/gnome-trans-applet/conduit-dclib.c
index 2e8d0ae..c267db2 100644
--- a/clients/gnome-trans-applet/conduit-dclib.c
+++ b/clients/gnome-trans-applet/conduit-dclib.c
@@ -195,12 +195,12 @@ static void dcfdcb(struct conduit *conduit, int fd, GdkInputCondition condition)
     {
 	if(!wcscmp(resp->cmdname, L".connect"))
 	{
-	    if(resp->code == 200)
+	    if(dc_checkprotocol(resp, DC_LATEST))
 	    {
-		dc_loginasync(NULL, 1, noconv, (void (*)(int, wchar_t *, void *))logincb, conduit);
-	    } else {
 		dc_disconnect();
 		disconnected(conduit);
+	    } else {
+		dc_loginasync(NULL, 1, noconv, (void (*)(int, wchar_t *, void *))logincb, conduit);
 	    }
 	} else if(!wcscmp(resp->cmdname, L".notify")) {
 	    dc_uimisc_handlenotify(resp);
@@ -273,14 +273,11 @@ static int init(struct conduit *conduit)
 static int connect(struct conduit *conduit)
 {
     struct data *data;
-    char *host;
     
     data = conduit->cdata;
     if(inuse != NULL)
 	return(-1);
-    if((host = getenv("DCSERVER")) == NULL)
-	host = "localhost";
-    if((data->fd = dc_connect(host, -1)) < 0)
+    if((data->fd = dc_connect(NULL)) < 0)
 	return(-1);
     data->gdkread = gdk_input_add(data->fd, GDK_INPUT_READ, (void (*)(gpointer, int, GdkInputCondition))dcfdcb, conduit);
     updatewrite(conduit);