Update to new dc_queuecmd syntax.

[doldaconnect.git] / clients / gnome-trans-applet / conduit-dclib.c

diff --git a/clients/gnome-trans-applet/conduit-dclib.c b/clients/gnome-trans-applet/conduit-dclib.c
index 2e8d0ae..a610f66 100644 (file)
--- a/clients/gnome-trans-applet/conduit-dclib.c
+++ b/clients/gnome-trans-applet/conduit-dclib.c
@@ -142,7 +142,7 @@ static void inittrans(struct conduit *conduit, struct dc_transfer *dt)
     dtd->conduit = conduit;
     dt->udata = dtd;
     dt->destroycb = dtfreecb;
-    dc_queuecmd(lstrargcb, dt, L"lstrarg", L"%%i", dt->id, NULL);
+    dc_queuecmd(lstrargcb, dt, L"lstrarg", L"%i", dt->id, NULL);
 }
 
 static void trlistcb(int resp, struct conduit *conduit)
@@ -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);
@@ -315,7 +312,7 @@ static int cancel(struct conduit *conduit, struct transfer *transfer)
     {
        if(((dtd = dt->udata) != NULL) && (dtd->ct == transfer))
        {
-           dc_queuecmd(NULL, NULL, L"cancel", L"%%i", dt->id, NULL);
+           dc_queuecmd(NULL, NULL, L"cancel", L"%i", dt->id, NULL);
            return(0);
        }
     }