]>
Commit | Line | Data |
---|---|---|
ed0429f5 AM |
1 | diff -urN ekg-1.4.org/lib/events.c ekg-1.4/lib/events.c |
2 | --- ekg-1.4.org/lib/events.c 2003-10-20 23:21:16.000000000 +0200 | |
3 | +++ ekg-1.4/lib/events.c 2003-11-18 00:46:56.000000000 +0100 | |
4 | @@ -1311,16 +1311,19 @@ | |
5 | sess->fd = -1; | |
6 | break; | |
7 | } | |
8 | - | |
9 | + | |
10 | if (h->type != GG_WELCOME) { | |
11 | - gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() invalid packet received\n"); | |
12 | + if (h->type == GG_NEED_EMAIL) | |
13 | + gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() email change needed\n"); | |
14 | + else | |
15 | + gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() invalid packet received\n"); | |
16 | ||
17 | free(h); | |
18 | close(sess->fd); | |
19 | sess->fd = -1; | |
20 | errno = EINVAL; | |
21 | e->type = GG_EVENT_CONN_FAILED; | |
22 | - e->event.failure = GG_FAILURE_INVALID; | |
23 | + e->event.failure = (h->type == GG_NEED_EMAIL) ? GG_FAILURE_NEED_EMAIL : GG_FAILURE_INVALID; | |
24 | sess->state = GG_STATE_IDLE; | |
25 | break; | |
26 | } | |
27 | diff -urN ekg-1.4.org/lib/libgadu.c ekg-1.4/lib/libgadu.c | |
28 | --- ekg-1.4.org/lib/libgadu.c 2003-10-27 22:29:12.000000000 +0100 | |
29 | +++ ekg-1.4/lib/libgadu.c 2003-11-03 19:30:06.000000000 +0100 | |
7e3cc800 AM |
30 | @@ -70,7 +70,7 @@ |
31 | #ifdef __GNUC__ | |
32 | __attribute__ ((unused)) | |
33 | #endif | |
34 | -= "$Id$"; | |
35 | += "$Id$"; | |
36 | #endif | |
37 | ||
38 | /* | |
ed0429f5 AM |
39 | @@ -1460,7 +1460,7 @@ |
40 | } | |
41 | ||
42 | if (!userlist || !count) | |
43 | - return 0; | |
44 | + return gg_send_packet(sess, GG_LIST_EMPTY, NULL); | |
45 | ||
46 | if (!(n = (struct gg_notify*) malloc(sizeof(*n) * count))) | |
47 | return -1; | |
48 | diff -urN ekg-1.4.org/lib/libgadu.h ekg-1.4/lib/libgadu.h | |
49 | --- ekg-1.4.org/lib/libgadu.h 2003-11-17 23:44:22.000000000 +0100 | |
7e3cc800 | 50 | +++ ekg-1.4/lib/libgadu.h 2003-11-22 19:49:59.000000000 +0100 |
ed0429f5 AM |
51 | @@ -1,4 +1,4 @@ |
52 | -/* $Id$ */ | |
53 | +/* $Id$ */ | |
54 | ||
55 | /* | |
56 | * (C) Copyright 2001-2003 Wojtek Kaniewski <wojtekka@irc.pl> | |
7e3cc800 AM |
57 | @@ -436,7 +436,8 @@ |
58 | ||
59 |