Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix dc_queuecmd portability (and changed 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
..
c267db2
100644
(file)
--- 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(!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);
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);
}
} 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;
static int connect(struct conduit *conduit)
{
struct data *data;
- char *host;
data = conduit->cdata;
if(inuse != NULL)
return(-1);
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);
return(-1);
data->gdkread = gdk_input_add(data->fd, GDK_INPUT_READ, (void (*)(gpointer, int, GdkInputCondition))dcfdcb, conduit);
updatewrite(conduit);