Mercurial > pidgin.yaz
annotate src/protocols/msn/dialog.c @ 13914:3ae8a3935406
[gaim-migrate @ 16414]
First stab at trying to fix the MSN http connect method. It still
doesn't work, and I'm not sure why, but it gets a lot farther in
the signon process now.
For those unfamiliar with the issue, the MSN http connect method
stopped working after all the non-blocking I/O changes. The http
connect method is apparently used by lots of people behind silly
firewalls and stuff, and therefore we really shouldn't release
Gaim 2.0.0 without it working, because people will complain.
The two main problems were
1. The outgoing message queue was removed in favor of buffering all
data to one large buffer. This sounds good in theory... but apparently
each message sent to and from the server has a "SessionID" in the
HTTP header. Every message we send should use the same SessionID as
the last packet we received from the server. So basically you can't
put two messages into the outgoing buffer at the same time because
you don't have the correct SessionID to use for the second message.
You have to wait until you get the reply from the server.
2. There were some strange buffer problems with using the wrong
variable when trying to combine the header+body into one buffer
before sending the message.
I also fixed a small memleak or two, added some comments, and
tried to clean up the code a little.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 03 Jul 2006 20:39:04 +0000 |
parents | 4e44ecb866bd |
children | 6fc412e59214 |
rev | line source |
---|---|
10044 | 1 /** |
2 * @file dialog.c Dialog functions | |
3 * | |
4 * gaim | |
5 * | |
6 * Gaim is the legal property of its developers, whose names are too numerous | |
7 * to list here. Please refer to the COPYRIGHT file distributed with this | |
8 * source distribution. | |
9 * | |
10 * This program is free software; you can redistribute it and/or modify | |
11 * it under the terms of the GNU General Public License as published by | |
12 * the Free Software Foundation; either version 2 of the License, or | |
13 * (at your option) any later version. | |
14 * | |
15 * This program is distributed in the hope that it will be useful, | |
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 * GNU General Public License for more details. | |
19 * | |
20 * You should have received a copy of the GNU General Public License | |
21 * along with this program; if not, write to the Free Software | |
22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
23 */ | |
24 | |
25 #include "msn.h" | |
12324
90f488e08216
[gaim-migrate @ 14628]
Richard Laager <rlaager@wiktel.com>
parents:
12323
diff
changeset
|
26 #include "dialog.h" |
10044 | 27 |
28 typedef struct | |
29 { | |
30 GaimConnection *gc; | |
31 char *who; | |
32 char *group; | |
33 gboolean add; | |
34 | |
35 } MsnAddRemData; | |
36 | |
13905
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
37 /* Remove the buddy referenced by the MsnAddRemData before the serverside list is changed. |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
38 * If the buddy will be added, he'll be added back; if he will be removed, he won't be. */ |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
39 static void |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
40 msn_complete_sync_issue(MsnAddRemData *data) |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
41 { |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
42 GaimBuddy *buddy; |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
43 GaimGroup *group = NULL; |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
44 |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
45 if (data->group != NULL) |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
46 group = gaim_find_group(data->group); |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
47 |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
48 if (group != NULL) |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
49 buddy = gaim_find_buddy_in_group(gaim_connection_get_account(data->gc), data->who, group); |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
50 else |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
51 buddy = gaim_find_buddy(gaim_connection_get_account(data->gc), data->who); |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
52 |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
53 if (buddy != NULL) |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
54 gaim_blist_remove_buddy(buddy); |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
55 } |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
56 |
10044 | 57 static void |
58 msn_add_cb(MsnAddRemData *data) | |
59 { | |
13905
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
60 msn_complete_sync_issue(data); |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
61 |
10044 | 62 if (g_list_find(gaim_connections_get_all(), data->gc) != NULL) |
63 { | |
64 MsnSession *session = data->gc->proto_data; | |
65 MsnUserList *userlist = session->userlist; | |
66 | |
67 msn_userlist_add_buddy(userlist, data->who, MSN_LIST_FL, data->group); | |
68 } | |
69 | |
70 if (data->group != NULL) | |
71 g_free(data->group); | |
72 | |
73 g_free(data->who); | |
74 g_free(data); | |
75 } | |
76 | |
77 static void | |
78 msn_rem_cb(MsnAddRemData *data) | |
79 { | |
13905
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
80 msn_complete_sync_issue(data); |
4e44ecb866bd
[gaim-migrate @ 16394]
Evan Schoenberg <evan.s@dreskin.net>
parents:
12324
diff
changeset
|
81 |
10044 | 82 if (g_list_find(gaim_connections_get_all(), data->gc) != NULL) |
83 { | |
84 MsnSession *session = data->gc->proto_data; | |
85 MsnUserList *userlist = session->userlist; | |
86 | |
87 msn_userlist_rem_buddy(userlist, data->who, MSN_LIST_FL, data->group); | |
88 } | |
89 | |
90 if (data->group != NULL) | |
91 g_free(data->group); | |
92 | |
93 g_free(data->who); | |
94 g_free(data); | |
95 } | |
96 | |
12324
90f488e08216
[gaim-migrate @ 14628]
Richard Laager <rlaager@wiktel.com>
parents:
12323
diff
changeset
|
97 void |
10044 | 98 msn_show_sync_issue(MsnSession *session, const char *passport, |
99 const char *group_name) | |
100 { | |
101 GaimConnection *gc; | |
102 GaimAccount *account; | |
103 MsnAddRemData *data; | |
104 char *msg, *reason; | |
105 | |
106 account = session->account; | |
107 gc = gaim_account_get_connection(account); | |
108 | |
109 data = g_new0(MsnAddRemData, 1); | |
110 data->who = g_strdup(passport); | |
111 data->group = g_strdup(group_name); | |
112 data->gc = gc; | |
113 | |
10310 | 114 msg = g_strdup_printf(_("Buddy list synchronization issue in %s (%s)"), |
10044 | 115 gaim_account_get_username(account), |
116 gaim_account_get_protocol_name(account)); | |
117 | |
118 if (group_name != NULL) | |
119 { | |
120 reason = g_strdup_printf(_("%s on the local list is " | |
121 "inside the group \"%s\" but not on " | |
122 "the server list. " | |
123 "Do you want this buddy to be added?"), | |
124 passport, group_name); | |
125 } | |
126 else | |
127 { | |
128 reason = g_strdup_printf(_("%s is on the local list but " | |
129 "not on the server list. " | |
130 "Do you want this buddy to be added?"), | |
131 passport); | |
132 } | |
133 | |
10116 | 134 gaim_request_action(gc, NULL, msg, reason, GAIM_DEFAULT_ACTION_NONE, |
135 data, 2, | |
10044 | 136 _("Yes"), G_CALLBACK(msn_add_cb), |
137 _("No"), G_CALLBACK(msn_rem_cb)); | |
138 | |
139 g_free(reason); | |
140 g_free(msg); | |
141 } |