Tue, 19 Jun 2007 17:28:41 +0000
propagate from branch 'im.pidgin.pidgin' (head 2f5c419a11f675b2df89fac1339e45275e3ae044)
to branch 'im.pidgin.cpw.khc.msnp14' (head 9a1cd8878a8912c32e9c575f2ae696f2bbb22442)
|
4542
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
1 | /** |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
2 | * @file msn.c The MSN protocol plugin |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
3 | * |
| 15884 | 4 | * purple |
|
4542
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
5 | * |
| 15884 | 6 | * Purple is the legal property of its developers, whose names are too numerous |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
7 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
8 | * source distribution. |
|
6701
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6695
diff
changeset
|
9 | * |
|
4542
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
10 | * This program is free software; you can redistribute it and/or modify |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
11 | * it under the terms of the GNU General Public License as published by |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
12 | * the Free Software Foundation; either version 2 of the License, or |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
13 | * (at your option) any later version. |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
14 | * |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
15 | * This program is distributed in the hope that it will be useful, |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
18 | * GNU General Public License for more details. |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
19 | * |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
20 | * You should have received a copy of the GNU General Public License |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
21 | * along with this program; if not, write to the Free Software |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
23 | */ |
| 9243 | 24 | #define PHOTO_SUPPORT 1 |
| 25 | ||
|
6827
df4411142ece
[gaim-migrate @ 7372]
Christian Hammond <chipx86@chipx86.com>
parents:
6801
diff
changeset
|
26 | #include <glib.h> |
|
df4411142ece
[gaim-migrate @ 7372]
Christian Hammond <chipx86@chipx86.com>
parents:
6801
diff
changeset
|
27 | |
|
4542
05a476dec582
[gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
4508
diff
changeset
|
28 | #include "msn.h" |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5626
diff
changeset
|
29 | #include "accountopt.h" |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
30 | #include "msg.h" |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
31 | #include "page.h" |
| 8713 | 32 | #include "pluginpref.h" |
|
5626
6e6fc61ea2db
[gaim-migrate @ 6033]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
33 | #include "prefs.h" |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
34 | #include "session.h" |
|
5361
a964b856e97f
[gaim-migrate @ 5737]
Christian Hammond <chipx86@chipx86.com>
parents:
5351
diff
changeset
|
35 | #include "state.h" |
|
13629
36b386194367
[gaim-migrate @ 16015]
Daniel Atallah <datallah@pidgin.im>
parents:
13628
diff
changeset
|
36 | #include "util.h" |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
37 | #include "cmds.h" |
|
15685
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
38 | #include "core.h" |
|
9713
bb37562302a1
[gaim-migrate @ 10574]
Mark Doliner <markdoliner@pidgin.im>
parents:
9684
diff
changeset
|
39 | #include "prpl.h" |
|
20475
0b3826f0e687
The first msn-p13-merge-head.diff.gz from SF Patch #1621854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20474
diff
changeset
|
40 | #include "msnutils.h" |
| 9943 | 41 | #include "version.h" |
|
4546
d14ad00fe294
[gaim-migrate @ 4825]
Herman Bloggs <herman@bluedigits.com>
parents:
4542
diff
changeset
|
42 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
43 | #include "switchboard.h" |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
44 | #include "notification.h" |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
45 | #include "sync.h" |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
46 | #include "slplink.h" |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
47 | |
| 9243 | 48 | #if PHOTO_SUPPORT |
| 49 | #include "imgstore.h" | |
| 50 | #endif | |
| 51 | ||
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
52 | typedef struct |
|
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
53 | { |
| 15884 | 54 | PurpleConnection *gc; |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
55 | const char *passport; |
|
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
56 | |
|
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
57 | } MsnMobileData; |
|
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
58 | |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
59 | typedef struct |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
60 | { |
| 15884 | 61 | PurpleConnection *gc; |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
62 | char *name; |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
63 | |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
64 | } MsnGetInfoData; |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
65 | |
| 9243 | 66 | typedef struct |
| 67 | { | |
| 68 | MsnGetInfoData *info_data; | |
| 69 | char *stripped; | |
| 70 | char *url_buffer; | |
| 15884 | 71 | PurpleNotifyUserInfo *user_info; |
| 9243 | 72 | char *photo_url_text; |
| 73 | ||
| 74 | } MsnGetInfoStepTwoData; | |
| 75 | ||
|
17103
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
76 | typedef struct |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
77 | { |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
78 | PurpleConnection *gc; |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
79 | const char *who; |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
80 | char *msg; |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
81 | PurpleMessageFlags flags; |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
82 | time_t when; |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
83 | } MsnIMData; |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
84 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
85 | static const char * |
| 15884 | 86 | msn_normalize(const PurpleAccount *account, const char *str) |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
87 | { |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
88 | static char buf[BUF_LEN]; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
89 | char *tmp; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
90 | |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
91 | g_return_val_if_fail(str != NULL, NULL); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
92 | |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
93 | g_snprintf(buf, sizeof(buf), "%s%s", str, |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
94 | (strchr(str, '@') ? "" : "@hotmail.com")); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
95 | |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
96 | tmp = g_utf8_strdown(buf, -1); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
97 | strncpy(buf, tmp, sizeof(buf)); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
98 | g_free(tmp); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
99 | |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
100 | return buf; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
101 | } |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
102 | |
| 15884 | 103 | static PurpleCmdRet |
| 104 | msn_cmd_nudge(PurpleConversation *conv, const gchar *cmd, gchar **args, gchar **error, void *data) | |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
105 | { |
| 15884 | 106 | PurpleAccount *account = purple_conversation_get_account(conv); |
| 107 | PurpleConnection *gc = purple_account_get_connection(account); | |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
108 | MsnMessage *msg; |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
109 | MsnSession *session; |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
110 | MsnSwitchBoard *swboard; |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
111 | |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
112 | msg = msn_message_new_nudge(); |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
113 | session = gc->proto_data; |
| 15884 | 114 | swboard = msn_session_get_swboard(session, purple_conversation_get_name(conv), MSN_SB_FLAG_IM); |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
115 | |
|
13635
dcbce56b7713
[gaim-migrate @ 16032]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13629
diff
changeset
|
116 | if (swboard == NULL) |
| 15884 | 117 | return PURPLE_CMD_RET_FAILED; |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
118 | |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
119 | msn_switchboard_send_msg(swboard, msg, TRUE); |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
120 | |
| 15884 | 121 | purple_conversation_write(conv, NULL, _("You have just sent a Nudge!"), PURPLE_MESSAGE_SYSTEM, time(NULL)); |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
122 | |
| 15884 | 123 | return PURPLE_CMD_RET_OK; |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
124 | } |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
125 | |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
126 | void |
| 15884 | 127 | msn_act_id(PurpleConnection *gc, const char *entry) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
128 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
129 | MsnCmdProc *cmdproc; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
130 | MsnSession *session; |
| 15884 | 131 | PurpleAccount *account; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
132 | const char *alias; |
| 2086 | 133 | |
|
20476
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
134 | char *soapbody; |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
135 | MsnSoapReq *soap_request; |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
136 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
137 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
138 | cmdproc = session->notification->cmdproc; |
| 15884 | 139 | account = purple_connection_get_account(gc); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
140 | |
|
10069
6b4b78889b52
[gaim-migrate @ 11045]
Derek Battams <dbattams@users.sourceforge.net>
parents:
10068
diff
changeset
|
141 | if(entry && strlen(entry)) |
| 15884 | 142 | alias = purple_url_encode(entry); |
|
10069
6b4b78889b52
[gaim-migrate @ 11045]
Derek Battams <dbattams@users.sourceforge.net>
parents:
10068
diff
changeset
|
143 | else |
|
6b4b78889b52
[gaim-migrate @ 11045]
Derek Battams <dbattams@users.sourceforge.net>
parents:
10068
diff
changeset
|
144 | alias = ""; |
| 3171 | 145 | |
|
8333
09d55969e801
[gaim-migrate @ 9057]
Christian Hammond <chipx86@chipx86.com>
parents:
8298
diff
changeset
|
146 | if (strlen(alias) > BUDDY_ALIAS_MAXLEN) |
|
09d55969e801
[gaim-migrate @ 9057]
Christian Hammond <chipx86@chipx86.com>
parents:
8298
diff
changeset
|
147 | { |
| 15884 | 148 | purple_notify_error(gc, NULL, |
|
5436
a0e0bacaa196
[gaim-migrate @ 5818]
Christian Hammond <chipx86@chipx86.com>
parents:
5382
diff
changeset
|
149 | _("Your new MSN friendly name is too long."), NULL); |
|
2738
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
150 | return; |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
151 | } |
|
bd5bcb1c8167
[gaim-migrate @ 2751]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2688
diff
changeset
|
152 | |
|
20476
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
153 | if (*alias == '\0') { |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
154 | alias = purple_url_encode(purple_account_get_username(account)); |
|
20474
b0ef257ef8d4
The second msn.tgz from SF Patch #1621854 from Ka-Hing Cheung.
Ka-Hing Cheung <khc@pidgin.im>
parents:
20473
diff
changeset
|
155 | } |
|
20476
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
156 | |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
157 | msn_cmdproc_send(cmdproc, "PRP", "MFN %s", alias); |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
158 | |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
159 | soapbody = g_strdup_printf(MSN_CONTACT_UPDATE_TEMPLATE, alias); |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
160 | /*build SOAP and POST it*/ |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
161 | soap_request = msn_soap_request_new(MSN_CONTACT_SERVER, |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
162 | MSN_ADDRESS_BOOK_POST_URL, |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
163 | MSN_CONTACT_UPDATE_SOAP_ACTION, |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
164 | soapbody, |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
165 | NULL, |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
166 | NULL); |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
167 | |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
168 | session->contact->soapconn->read_cb = NULL; |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
169 | msn_soap_post(session->contact->soapconn, |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
170 | soap_request, |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
171 | msn_contact_connect_init); |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
172 | |
|
198222e01a7d
The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung.
Richard Laager <rlaager@pidgin.im>
parents:
20475
diff
changeset
|
173 | g_free(soapbody); |
| 2086 | 174 | } |
| 175 | ||
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
176 | static void |
| 15884 | 177 | msn_set_prp(PurpleConnection *gc, const char *type, const char *entry) |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
178 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
179 | MsnCmdProc *cmdproc; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
180 | MsnSession *session; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
181 | |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
182 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
183 | cmdproc = session->notification->cmdproc; |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
184 | |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
185 | if (entry == NULL || *entry == '\0') |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
186 | { |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
187 | msn_cmdproc_send(cmdproc, "PRP", "%s", type); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
188 | } |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
189 | else |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
190 | { |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
191 | msn_cmdproc_send(cmdproc, "PRP", "%s %s", type, |
| 15884 | 192 | purple_url_encode(entry)); |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
193 | } |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
194 | } |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
195 | |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
196 | static void |
| 15884 | 197 | msn_set_home_phone_cb(PurpleConnection *gc, const char *entry) |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
198 | { |
|
5491
38c414014f4f
[gaim-migrate @ 5887]
Christian Hammond <chipx86@chipx86.com>
parents:
5481
diff
changeset
|
199 | msn_set_prp(gc, "PHH", entry); |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
200 | } |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
201 | |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
202 | static void |
| 15884 | 203 | msn_set_work_phone_cb(PurpleConnection *gc, const char *entry) |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
204 | { |
|
5491
38c414014f4f
[gaim-migrate @ 5887]
Christian Hammond <chipx86@chipx86.com>
parents:
5481
diff
changeset
|
205 | msn_set_prp(gc, "PHW", entry); |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
206 | } |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
207 | |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
208 | static void |
| 15884 | 209 | msn_set_mobile_phone_cb(PurpleConnection *gc, const char *entry) |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
210 | { |
|
5491
38c414014f4f
[gaim-migrate @ 5887]
Christian Hammond <chipx86@chipx86.com>
parents:
5481
diff
changeset
|
211 | msn_set_prp(gc, "PHM", entry); |
|
5364
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
212 | } |
|
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
213 | |
|
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
214 | static void |
| 15884 | 215 | enable_msn_pages_cb(PurpleConnection *gc) |
|
5364
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
216 | { |
|
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
217 | msn_set_prp(gc, "MOB", "Y"); |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
218 | } |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
219 | |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
220 | static void |
| 15884 | 221 | disable_msn_pages_cb(PurpleConnection *gc) |
|
5364
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
222 | { |
|
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
223 | msn_set_prp(gc, "MOB", "N"); |
|
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
224 | } |
|
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
225 | |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
226 | static void |
| 15884 | 227 | send_to_mobile(PurpleConnection *gc, const char *who, const char *entry) |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
228 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
229 | MsnTransaction *trans; |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8595
diff
changeset
|
230 | MsnSession *session; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
231 | MsnCmdProc *cmdproc; |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
232 | MsnPage *page; |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8595
diff
changeset
|
233 | char *payload; |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8595
diff
changeset
|
234 | size_t payload_len; |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
235 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
236 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
237 | cmdproc = session->notification->cmdproc; |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
238 | |
|
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
239 | page = msn_page_new(); |
|
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
240 | msn_page_set_body(page, entry); |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8595
diff
changeset
|
241 | |
|
9092
34b9e78827f6
[gaim-migrate @ 9869]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9091
diff
changeset
|
242 | payload = msn_page_gen_payload(page, &payload_len); |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8595
diff
changeset
|
243 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10116
diff
changeset
|
244 | trans = msn_transaction_new(cmdproc, "PGD", "%s 1 %d", who, payload_len); |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
245 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
246 | msn_transaction_set_payload(trans, payload, payload_len); |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
247 | |
|
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
248 | msn_page_destroy(page); |
|
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
249 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
250 | msn_cmdproc_send_trans(cmdproc, trans); |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
251 | } |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
252 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
253 | static void |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
254 | send_to_mobile_cb(MsnMobileData *data, const char *entry) |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
255 | { |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
256 | send_to_mobile(data->gc, data->passport, entry); |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
257 | g_free(data); |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
258 | } |
|
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
259 | |
|
5491
38c414014f4f
[gaim-migrate @ 5887]
Christian Hammond <chipx86@chipx86.com>
parents:
5481
diff
changeset
|
260 | static void |
|
5793
28d84d5e5663
[gaim-migrate @ 6218]
Christian Hammond <chipx86@chipx86.com>
parents:
5717
diff
changeset
|
261 | close_mobile_page_cb(MsnMobileData *data, const char *entry) |
|
5491
38c414014f4f
[gaim-migrate @ 5887]
Christian Hammond <chipx86@chipx86.com>
parents:
5481
diff
changeset
|
262 | { |
|
38c414014f4f
[gaim-migrate @ 5887]
Christian Hammond <chipx86@chipx86.com>
parents:
5481
diff
changeset
|
263 | g_free(data); |
|
38c414014f4f
[gaim-migrate @ 5887]
Christian Hammond <chipx86@chipx86.com>
parents:
5481
diff
changeset
|
264 | } |
|
38c414014f4f
[gaim-migrate @ 5887]
Christian Hammond <chipx86@chipx86.com>
parents:
5481
diff
changeset
|
265 | |
|
5364
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
266 | /* -- */ |
|
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
267 | |
|
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
268 | static void |
| 15884 | 269 | msn_show_set_friendly_name(PurplePluginAction *action) |
| 2086 | 270 | { |
| 15884 | 271 | PurpleConnection *gc; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
272 | |
| 15884 | 273 | gc = (PurpleConnection *) action->context; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
274 | |
| 15884 | 275 | purple_request_input(gc, NULL, _("Set your friendly name."), |
|
5491
38c414014f4f
[gaim-migrate @ 5887]
Christian Hammond <chipx86@chipx86.com>
parents:
5481
diff
changeset
|
276 | _("This is the name that other MSN buddies will " |
|
38c414014f4f
[gaim-migrate @ 5887]
Christian Hammond <chipx86@chipx86.com>
parents:
5481
diff
changeset
|
277 | "see you as."), |
| 15884 | 278 | purple_connection_get_display_name(gc), FALSE, FALSE, NULL, |
|
5481
2f161d72e311
[gaim-migrate @ 5877]
Christian Hammond <chipx86@chipx86.com>
parents:
5436
diff
changeset
|
279 | _("OK"), G_CALLBACK(msn_act_id), |
|
16490
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
280 | _("Cancel"), NULL, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
281 | purple_connection_get_account(gc), NULL, NULL, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
282 | gc); |
| 2086 | 283 | } |
| 284 | ||
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
285 | static void |
| 15884 | 286 | msn_show_set_home_phone(PurplePluginAction *action) |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
287 | { |
| 15884 | 288 | PurpleConnection *gc; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
289 | MsnSession *session; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
290 | |
| 15884 | 291 | gc = (PurpleConnection *) action->context; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
292 | session = gc->proto_data; |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
293 | |
| 15884 | 294 | purple_request_input(gc, NULL, _("Set your home phone number."), NULL, |
| 8697 | 295 | msn_user_get_home_phone(session->user), FALSE, FALSE, NULL, |
|
5491
38c414014f4f
[gaim-migrate @ 5887]
Christian Hammond <chipx86@chipx86.com>
parents:
5481
diff
changeset
|
296 | _("OK"), G_CALLBACK(msn_set_home_phone_cb), |
|
16490
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
297 | _("Cancel"), NULL, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
298 | purple_connection_get_account(gc), NULL, NULL, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
299 | gc); |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
300 | } |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
301 | |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
302 | static void |
| 15884 | 303 | msn_show_set_work_phone(PurplePluginAction *action) |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
304 | { |
| 15884 | 305 | PurpleConnection *gc; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
306 | MsnSession *session; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
307 | |
| 15884 | 308 | gc = (PurpleConnection *) action->context; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
309 | session = gc->proto_data; |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
310 | |
| 15884 | 311 | purple_request_input(gc, NULL, _("Set your work phone number."), NULL, |
| 8697 | 312 | msn_user_get_work_phone(session->user), FALSE, FALSE, NULL, |
|
5491
38c414014f4f
[gaim-migrate @ 5887]
Christian Hammond <chipx86@chipx86.com>
parents:
5481
diff
changeset
|
313 | _("OK"), G_CALLBACK(msn_set_work_phone_cb), |
|
16490
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
314 | _("Cancel"), NULL, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
315 | purple_connection_get_account(gc), NULL, NULL, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
316 | gc); |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
317 | } |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
318 | |
|
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
319 | static void |
| 15884 | 320 | msn_show_set_mobile_phone(PurplePluginAction *action) |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
321 | { |
| 15884 | 322 | PurpleConnection *gc; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
323 | MsnSession *session; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
324 | |
| 15884 | 325 | gc = (PurpleConnection *) action->context; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
326 | session = gc->proto_data; |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
327 | |
| 15884 | 328 | purple_request_input(gc, NULL, _("Set your mobile phone number."), NULL, |
| 8697 | 329 | msn_user_get_mobile_phone(session->user), FALSE, FALSE, NULL, |
|
5491
38c414014f4f
[gaim-migrate @ 5887]
Christian Hammond <chipx86@chipx86.com>
parents:
5481
diff
changeset
|
330 | _("OK"), G_CALLBACK(msn_set_mobile_phone_cb), |
|
16490
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
331 | _("Cancel"), NULL, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
332 | purple_connection_get_account(gc), NULL, NULL, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
333 | gc); |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
334 | } |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
335 | |
|
5364
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
336 | static void |
| 15884 | 337 | msn_show_set_mobile_pages(PurplePluginAction *action) |
|
5364
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
338 | { |
| 15884 | 339 | PurpleConnection *gc; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
340 | |
| 15884 | 341 | gc = (PurpleConnection *) action->context; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
342 | |
| 15884 | 343 | purple_request_action(gc, NULL, _("Allow MSN Mobile pages?"), |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
344 | _("Do you want to allow or disallow people on " |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
345 | "your buddy list to send you MSN Mobile pages " |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
346 | "to your cell phone or other mobile device?"), |
|
16490
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
347 | -1, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
348 | purple_connection_get_account(gc), NULL, NULL, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
349 | gc, 3, |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
350 | _("Allow"), G_CALLBACK(enable_msn_pages_cb), |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
351 | _("Disallow"), G_CALLBACK(disable_msn_pages_cb), |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
352 | _("Cancel"), NULL); |
|
5364
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
353 | } |
|
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
354 | |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
355 | static void |
| 15884 | 356 | msn_show_hotmail_inbox(PurplePluginAction *action) |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
357 | { |
| 15884 | 358 | PurpleConnection *gc; |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
359 | MsnSession *session; |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
360 | |
| 15884 | 361 | gc = (PurpleConnection *) action->context; |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
362 | session = gc->proto_data; |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
363 | |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
364 | if (session->passport_info.file == NULL) |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
365 | { |
| 15884 | 366 | purple_notify_error(gc, NULL, |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
367 | _("This Hotmail account may not be active."), NULL); |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
368 | return; |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
369 | } |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
370 | |
| 15884 | 371 | purple_notify_uri(gc, session->passport_info.file); |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
372 | } |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
373 | |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
374 | static void |
| 15884 | 375 | show_send_to_mobile_cb(PurpleBlistNode *node, gpointer ignored) |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
376 | { |
| 15884 | 377 | PurpleBuddy *buddy; |
| 378 | PurpleConnection *gc; | |
| 9042 | 379 | MsnSession *session; |
| 380 | MsnMobileData *data; | |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
381 | |
| 15884 | 382 | g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
383 | |
| 15884 | 384 | buddy = (PurpleBuddy *) node; |
| 385 | gc = purple_account_get_connection(buddy->account); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
386 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
387 | session = gc->proto_data; |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
388 | |
|
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
389 | data = g_new0(MsnMobileData, 1); |
|
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
390 | data->gc = gc; |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
391 | data->passport = buddy->name; |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
392 | |
| 15884 | 393 | purple_request_input(gc, NULL, _("Send a mobile message."), NULL, |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
394 | NULL, TRUE, FALSE, NULL, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
395 | _("Page"), G_CALLBACK(send_to_mobile_cb), |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
396 | _("Close"), G_CALLBACK(close_mobile_page_cb), |
|
16490
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
397 | purple_connection_get_account(gc), purple_buddy_get_name(buddy), NULL, |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
398 | data); |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
399 | } |
|
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
400 | |
|
16890
3ea8e90bacd1
Make MSN mobile buddies offline, mobile, and offline-messagable. Fixes #215
Sean Egan <seanegan@pidgin.im>
parents:
16746
diff
changeset
|
401 | static gboolean |
|
3ea8e90bacd1
Make MSN mobile buddies offline, mobile, and offline-messagable. Fixes #215
Sean Egan <seanegan@pidgin.im>
parents:
16746
diff
changeset
|
402 | msn_offline_message(const PurpleBuddy *buddy) { |
|
16923
515f3988a430
Fix declaration after statement.
Daniel Atallah <datallah@pidgin.im>
parents:
16890
diff
changeset
|
403 | MsnUser *user; |
|
16890
3ea8e90bacd1
Make MSN mobile buddies offline, mobile, and offline-messagable. Fixes #215
Sean Egan <seanegan@pidgin.im>
parents:
16746
diff
changeset
|
404 | if (buddy == NULL) |
|
3ea8e90bacd1
Make MSN mobile buddies offline, mobile, and offline-messagable. Fixes #215
Sean Egan <seanegan@pidgin.im>
parents:
16746
diff
changeset
|
405 | return FALSE; |
|
16923
515f3988a430
Fix declaration after statement.
Daniel Atallah <datallah@pidgin.im>
parents:
16890
diff
changeset
|
406 | user = buddy->proto_data; |
|
16890
3ea8e90bacd1
Make MSN mobile buddies offline, mobile, and offline-messagable. Fixes #215
Sean Egan <seanegan@pidgin.im>
parents:
16746
diff
changeset
|
407 | return user && user->mobile; |
|
3ea8e90bacd1
Make MSN mobile buddies offline, mobile, and offline-messagable. Fixes #215
Sean Egan <seanegan@pidgin.im>
parents:
16746
diff
changeset
|
408 | } |
|
3ea8e90bacd1
Make MSN mobile buddies offline, mobile, and offline-messagable. Fixes #215
Sean Egan <seanegan@pidgin.im>
parents:
16746
diff
changeset
|
409 | |
|
6148
e3e81ed229c2
[gaim-migrate @ 6622]
Christian Hammond <chipx86@chipx86.com>
parents:
6059
diff
changeset
|
410 | static void |
| 15884 | 411 | initiate_chat_cb(PurpleBlistNode *node, gpointer data) |
|
6148
e3e81ed229c2
[gaim-migrate @ 6622]
Christian Hammond <chipx86@chipx86.com>
parents:
6059
diff
changeset
|
412 | { |
| 15884 | 413 | PurpleBuddy *buddy; |
| 414 | PurpleConnection *gc; | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
415 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
416 | MsnSession *session; |
|
6148
e3e81ed229c2
[gaim-migrate @ 6622]
Christian Hammond <chipx86@chipx86.com>
parents:
6059
diff
changeset
|
417 | MsnSwitchBoard *swboard; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
418 | |
| 15884 | 419 | g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); |
|
6148
e3e81ed229c2
[gaim-migrate @ 6622]
Christian Hammond <chipx86@chipx86.com>
parents:
6059
diff
changeset
|
420 | |
| 15884 | 421 | buddy = (PurpleBuddy *) node; |
| 422 | gc = purple_account_get_connection(buddy->account); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
423 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
424 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
425 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
426 | swboard = msn_switchboard_new(session); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
427 | msn_switchboard_request(swboard); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
428 | msn_switchboard_request_add_user(swboard, buddy->name); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
429 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
430 | /* TODO: This might move somewhere else, after USR might be */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
431 | swboard->chat_id = session->conv_seq++; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
432 | swboard->conv = serv_got_joined_chat(gc, swboard->chat_id, "MSN Chat"); |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10738
diff
changeset
|
433 | swboard->flag = MSN_SB_FLAG_IM; |
|
9363
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
434 | |
| 15884 | 435 | purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), |
| 436 | purple_account_get_username(buddy->account), NULL, PURPLE_CBFLAGS_NONE, TRUE); | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
437 | } |
|
6148
e3e81ed229c2
[gaim-migrate @ 6622]
Christian Hammond <chipx86@chipx86.com>
parents:
6059
diff
changeset
|
438 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
439 | static void |
| 15884 | 440 | t_msn_xfer_init(PurpleXfer *xfer) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
441 | { |
|
17089
b27c8579750b
Patch from sourceforge tracker 1652005 from wabz to fix displaying file
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16923
diff
changeset
|
442 | MsnSlpLink *slplink = xfer->data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
443 | msn_slplink_request_ft(slplink, xfer); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
444 | } |
|
6148
e3e81ed229c2
[gaim-migrate @ 6622]
Christian Hammond <chipx86@chipx86.com>
parents:
6059
diff
changeset
|
445 | |
| 15884 | 446 | static PurpleXfer* |
| 447 | msn_new_xfer(PurpleConnection *gc, const char *who) | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
448 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
449 | MsnSession *session; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
450 | MsnSlpLink *slplink; |
| 15884 | 451 | PurpleXfer *xfer; |
|
12161
3c0edd63fe96
[gaim-migrate @ 14462]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12143
diff
changeset
|
452 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
453 | session = gc->proto_data; |
|
12161
3c0edd63fe96
[gaim-migrate @ 14462]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12143
diff
changeset
|
454 | |
| 15884 | 455 | xfer = purple_xfer_new(gc->account, PURPLE_XFER_SEND, who); |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
456 | |
|
15345
797936e968ff
[gaim-migrate @ 18073]
Evan Schoenberg <evands@pidgin.im>
parents:
15281
diff
changeset
|
457 | if (xfer) |
|
797936e968ff
[gaim-migrate @ 18073]
Evan Schoenberg <evands@pidgin.im>
parents:
15281
diff
changeset
|
458 | { |
|
797936e968ff
[gaim-migrate @ 18073]
Evan Schoenberg <evands@pidgin.im>
parents:
15281
diff
changeset
|
459 | slplink = msn_session_get_slplink(session, who); |
|
12161
3c0edd63fe96
[gaim-migrate @ 14462]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12143
diff
changeset
|
460 | |
|
15345
797936e968ff
[gaim-migrate @ 18073]
Evan Schoenberg <evands@pidgin.im>
parents:
15281
diff
changeset
|
461 | xfer->data = slplink; |
|
12161
3c0edd63fe96
[gaim-migrate @ 14462]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12143
diff
changeset
|
462 | |
| 15884 | 463 | purple_xfer_set_init_fnc(xfer, t_msn_xfer_init); |
|
15345
797936e968ff
[gaim-migrate @ 18073]
Evan Schoenberg <evands@pidgin.im>
parents:
15281
diff
changeset
|
464 | } |
|
12161
3c0edd63fe96
[gaim-migrate @ 14462]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12143
diff
changeset
|
465 | |
|
12143
09f216663302
[gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents:
11992
diff
changeset
|
466 | return xfer; |
|
09f216663302
[gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents:
11992
diff
changeset
|
467 | } |
|
6148
e3e81ed229c2
[gaim-migrate @ 6622]
Christian Hammond <chipx86@chipx86.com>
parents:
6059
diff
changeset
|
468 | |
|
12143
09f216663302
[gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents:
11992
diff
changeset
|
469 | static void |
| 15884 | 470 | msn_send_file(PurpleConnection *gc, const char *who, const char *file) |
|
12143
09f216663302
[gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents:
11992
diff
changeset
|
471 | { |
| 15884 | 472 | PurpleXfer *xfer = msn_new_xfer(gc, who); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
473 | |
|
9466
b6425eab60ca
[gaim-migrate @ 10291]
Daniel Atallah <datallah@pidgin.im>
parents:
9363
diff
changeset
|
474 | if (file) |
| 15884 | 475 | purple_xfer_request_accepted(xfer, file); |
|
9466
b6425eab60ca
[gaim-migrate @ 10291]
Daniel Atallah <datallah@pidgin.im>
parents:
9363
diff
changeset
|
476 | else |
| 15884 | 477 | purple_xfer_request(xfer); |
|
6148
e3e81ed229c2
[gaim-migrate @ 6622]
Christian Hammond <chipx86@chipx86.com>
parents:
6059
diff
changeset
|
478 | } |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
479 | |
|
10116
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
480 | static gboolean |
| 15884 | 481 | msn_can_receive_file(PurpleConnection *gc, const char *who) |
|
10116
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
482 | { |
| 15884 | 483 | PurpleAccount *account; |
|
10116
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
484 | char *normal; |
|
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
485 | gboolean ret; |
|
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
486 | |
| 15884 | 487 | account = purple_connection_get_account(gc); |
|
10116
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
488 | |
| 15884 | 489 | normal = g_strdup(msn_normalize(account, purple_account_get_username(account))); |
|
10116
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
490 | |
|
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
491 | ret = strcmp(normal, msn_normalize(account, who)); |
|
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
492 | |
|
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
493 | g_free(normal); |
|
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
494 | |
|
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
495 | return ret; |
|
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
496 | } |
|
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
497 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
498 | /************************************************************************** |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
499 | * Protocol Plugin ops |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
500 | **************************************************************************/ |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
501 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
502 | static const char * |
| 15884 | 503 | msn_list_icon(PurpleAccount *a, PurpleBuddy *b) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
504 | { |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
505 | return "msn"; |
| 2993 | 506 | } |
| 507 | ||
| 13888 | 508 | /* |
| 509 | * Set the User status text | |
| 510 | * Add the PSM String Using "Name - PSM String" format | |
| 511 | */ | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
512 | static char * |
| 15884 | 513 | msn_status_text(PurpleBuddy *buddy) |
| 2086 | 514 | { |
| 15884 | 515 | PurplePresence *presence; |
| 516 | PurpleStatus *status; | |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
517 | const char *msg, *name, *cmedia; |
|
20474
b0ef257ef8d4
The second msn.tgz from SF Patch #1621854 from Ka-Hing Cheung.
Ka-Hing Cheung <khc@pidgin.im>
parents:
20473
diff
changeset
|
518 | char *psm_str, *tmp2, *text; |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
519 | |
| 15884 | 520 | presence = purple_buddy_get_presence(buddy); |
| 521 | status = purple_presence_get_active_status(presence); | |
| 9951 | 522 | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
523 | msg = purple_status_get_attr_string(status, "message"); |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
524 | cmedia=purple_status_get_attr_string(status, "currentmedia"); |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
525 | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
526 | if (!purple_presence_is_available(presence) && !purple_presence_is_idle(presence)){ |
|
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
527 | name = purple_status_get_name(status); |
| 13888 | 528 | }else{ |
| 529 | name = NULL; | |
| 530 | } | |
| 531 | ||
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
532 | if (cmedia != NULL) { |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
533 | if(name) { |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
534 | tmp2 = g_strdup_printf("%s - %s", name, cmedia); |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
535 | text = g_markup_escape_text(tmp2, -1); |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
536 | } else { |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
537 | text = g_markup_escape_text(cmedia, -1); |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
538 | } |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
539 | return text; |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
540 | } else if (msg != NULL) { |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
541 | tmp2 = purple_markup_strip_html(msg); |
| 13888 | 542 | if (name){ |
| 543 | psm_str = g_strdup_printf("%s - %s", name, tmp2); | |
| 544 | g_free(tmp2); | |
| 545 | }else{ | |
| 546 | psm_str = tmp2; | |
| 547 | } | |
| 548 | text = g_markup_escape_text(psm_str, -1); | |
| 549 | g_free(psm_str); | |
| 550 | return text; | |
| 551 | } else { | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
552 | if (!purple_presence_is_available(presence) && !purple_presence_is_idle(presence)){ |
|
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
553 | psm_str = g_strdup(purple_status_get_name(status)); |
| 13888 | 554 | text = g_markup_escape_text(psm_str, -1); |
| 555 | g_free(psm_str); | |
| 556 | return text; | |
| 557 | } | |
|
10057
f5670751740c
[gaim-migrate @ 11022]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10049
diff
changeset
|
558 | } |
|
f5670751740c
[gaim-migrate @ 11022]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10049
diff
changeset
|
559 | |
|
f5670751740c
[gaim-migrate @ 11022]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10049
diff
changeset
|
560 | return NULL; |
|
f5670751740c
[gaim-migrate @ 11022]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10049
diff
changeset
|
561 | } |
|
f5670751740c
[gaim-migrate @ 11022]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10049
diff
changeset
|
562 | |
|
12970
c2f3b4dcf711
[gaim-migrate @ 15323]
Richard Laager <rlaager@pidgin.im>
parents:
12948
diff
changeset
|
563 | static void |
| 15884 | 564 | msn_tooltip_text(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info, gboolean full) |
|
10057
f5670751740c
[gaim-migrate @ 11022]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10049
diff
changeset
|
565 | { |
|
f5670751740c
[gaim-migrate @ 11022]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10049
diff
changeset
|
566 | MsnUser *user; |
| 15884 | 567 | PurplePresence *presence = purple_buddy_get_presence(buddy); |
| 568 | PurpleStatus *status = purple_presence_get_active_status(presence); | |
|
10057
f5670751740c
[gaim-migrate @ 11022]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10049
diff
changeset
|
569 | |
|
f5670751740c
[gaim-migrate @ 11022]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10049
diff
changeset
|
570 | user = buddy->proto_data; |
|
f5670751740c
[gaim-migrate @ 11022]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10049
diff
changeset
|
571 | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
572 | |
| 15884 | 573 | if (purple_presence_is_online(presence)) |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
574 | { |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
575 | const char *psm, *currentmedia; |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
576 | char *tmp; |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
577 | |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
578 | psm = purple_status_get_attr_string(status, "message"); |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
579 | currentmedia = purple_status_get_attr_string(status, "currentmedia"); |
| 13905 | 580 | |
| 15884 | 581 | purple_notify_user_info_add_pair(user_info, _("Status"), |
| 582 | (purple_presence_is_idle(presence) ? _("Idle") : purple_status_get_name(status))); | |
|
20473
91e1b3a49d10
msn.tgz from SF Patch #1621854 from Ka-Hing Cheung
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
583 | if (psm) { |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
584 | tmp = g_markup_escape_text(psm, -1); |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
585 | purple_notify_user_info_add_pair(user_info, _("PSM"), tmp); |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
586 | g_free(tmp); |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
587 | } |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
588 | if (currentmedia) { |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
589 | tmp = g_markup_escape_text(currentmedia, -1); |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
590 | purple_notify_user_info_add_pair(user_info, _("Current media"), tmp); |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
591 | g_free(tmp); |
|
20473
91e1b3a49d10
msn.tgz from SF Patch #1621854 from Ka-Hing Cheung
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
592 | } |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
593 | } |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
594 | |
|
12948
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
595 | if (full && user) |
|
10093
e22f76d46b0b
[gaim-migrate @ 11111]
Evan Schoenberg <evands@pidgin.im>
parents:
10069
diff
changeset
|
596 | { |
| 15884 | 597 | purple_notify_user_info_add_pair(user_info, _("Has you"), |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
598 | ((user->list_op & (1 << MSN_LIST_RL)) ? _("Yes") : _("No"))); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
599 | } |
|
12948
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
600 | |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
601 | /* XXX: This is being shown in non-full tooltips because the |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
602 | * XXX: blocked icon overlay isn't always accurate for MSN. |
| 15884 | 603 | * XXX: This can die as soon as purple_privacy_check() knows that |
|
12948
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
604 | * XXX: this prpl always honors both the allow and deny lists. */ |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
605 | if (user) |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
606 | { |
| 15884 | 607 | purple_notify_user_info_add_pair(user_info, _("Blocked"), |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
608 | ((user->list_op & (1 << MSN_LIST_BL)) ? _("Yes") : _("No"))); |
|
10093
e22f76d46b0b
[gaim-migrate @ 11111]
Evan Schoenberg <evands@pidgin.im>
parents:
10069
diff
changeset
|
609 | } |
| 2086 | 610 | } |
| 611 | ||
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
612 | static GList * |
| 15884 | 613 | msn_status_types(PurpleAccount *account) |
| 2086 | 614 | { |
| 15884 | 615 | PurpleStatusType *status; |
| 9951 | 616 | GList *types = NULL; |
| 13888 | 617 | #if 0 |
| 15884 | 618 | status = purple_status_type_new_full(PURPLE_STATUS_AVAILABLE, |
|
12595
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12489
diff
changeset
|
619 | NULL, NULL, FALSE, TRUE, FALSE); |
| 13888 | 620 | #endif |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
621 | status = purple_status_type_new_with_attrs( |
|
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
622 | PURPLE_STATUS_AVAILABLE, NULL, NULL, TRUE, TRUE, FALSE, |
|
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
623 | "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
624 | "currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING), |
| 13888 | 625 | NULL); |
|
9967
7400b348ff62
[gaim-migrate @ 10877]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9953
diff
changeset
|
626 | types = g_list_append(types, status); |
| 2086 | 627 | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
628 | status = purple_status_type_new_with_attrs( |
|
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
629 | PURPLE_STATUS_AWAY, NULL, NULL, TRUE, TRUE, FALSE, |
|
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
630 | "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
631 | "currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING), |
| 13888 | 632 | NULL); |
|
9967
7400b348ff62
[gaim-migrate @ 10877]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9953
diff
changeset
|
633 | types = g_list_append(types, status); |
|
7400b348ff62
[gaim-migrate @ 10877]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9953
diff
changeset
|
634 | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
635 | status = purple_status_type_new_with_attrs( |
|
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
636 | PURPLE_STATUS_AWAY, "brb", _("Be Right Back"), TRUE, TRUE, FALSE, |
|
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
637 | "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
638 | "currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING), |
| 13888 | 639 | NULL); |
|
9967
7400b348ff62
[gaim-migrate @ 10877]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9953
diff
changeset
|
640 | types = g_list_append(types, status); |
|
7400b348ff62
[gaim-migrate @ 10877]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9953
diff
changeset
|
641 | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
642 | status = purple_status_type_new_with_attrs( |
|
20520
49dd75a0c895
Patch from Pse to use the same status primitives as im.pidgin.pidgin for
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20508
diff
changeset
|
643 | PURPLE_STATUS_UNAVAILABLE, "busy", _("Busy"), TRUE, TRUE, FALSE, |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
644 | "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
645 | "currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING), |
| 13888 | 646 | NULL); |
|
9967
7400b348ff62
[gaim-migrate @ 10877]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9953
diff
changeset
|
647 | types = g_list_append(types, status); |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
648 | status = purple_status_type_new_with_attrs( |
|
20520
49dd75a0c895
Patch from Pse to use the same status primitives as im.pidgin.pidgin for
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20508
diff
changeset
|
649 | PURPLE_STATUS_UNAVAILABLE, "phone", _("On the Phone"), TRUE, TRUE, FALSE, |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
650 | "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
651 | "currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING), |
| 13888 | 652 | NULL); |
|
9967
7400b348ff62
[gaim-migrate @ 10877]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9953
diff
changeset
|
653 | types = g_list_append(types, status); |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
654 | status = purple_status_type_new_with_attrs( |
|
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
655 | PURPLE_STATUS_AWAY, "lunch", _("Out to Lunch"), TRUE, TRUE, FALSE, |
|
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
656 | "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
657 | "currentmedia", _("Current media"), purple_value_new(PURPLE_TYPE_STRING), |
| 13888 | 658 | NULL); |
|
9967
7400b348ff62
[gaim-migrate @ 10877]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9953
diff
changeset
|
659 | types = g_list_append(types, status); |
|
7400b348ff62
[gaim-migrate @ 10877]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9953
diff
changeset
|
660 | |
| 15884 | 661 | status = purple_status_type_new_full(PURPLE_STATUS_INVISIBLE, |
|
12595
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12489
diff
changeset
|
662 | NULL, NULL, FALSE, TRUE, FALSE); |
|
9967
7400b348ff62
[gaim-migrate @ 10877]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9953
diff
changeset
|
663 | types = g_list_append(types, status); |
| 9951 | 664 | |
| 15884 | 665 | status = purple_status_type_new_full(PURPLE_STATUS_OFFLINE, |
|
12658
4aa7a873628d
[gaim-migrate @ 15001]
Mark Doliner <markdoliner@pidgin.im>
parents:
12645
diff
changeset
|
666 | NULL, NULL, FALSE, TRUE, FALSE); |
|
4aa7a873628d
[gaim-migrate @ 15001]
Mark Doliner <markdoliner@pidgin.im>
parents:
12645
diff
changeset
|
667 | types = g_list_append(types, status); |
|
20508
a8855578906a
Revert a bunch of whitespace changes so reviewing a diff against
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20505
diff
changeset
|
668 | |
| 15884 | 669 | status = purple_status_type_new_full(PURPLE_STATUS_MOBILE, |
|
15602
6d1d20a9e297
This is my attempt at MSN mobile status, but I suspect MSN mobile status doesn't exist. If it's confirmed that it doesn't, I'll revert this. But I want to keep it for posterity, in case it does exist
Sean Egan <seanegan@pidgin.im>
parents:
15524
diff
changeset
|
670 | "mobile", NULL, FALSE, FALSE, TRUE); |
|
6d1d20a9e297
This is my attempt at MSN mobile status, but I suspect MSN mobile status doesn't exist. If it's confirmed that it doesn't, I'll revert this. But I want to keep it for posterity, in case it does exist
Sean Egan <seanegan@pidgin.im>
parents:
15524
diff
changeset
|
671 | types = g_list_append(types, status); |
|
20508
a8855578906a
Revert a bunch of whitespace changes so reviewing a diff against
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20505
diff
changeset
|
672 | |
| 9951 | 673 | return types; |
| 2086 | 674 | } |
| 675 | ||
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
676 | static GList * |
| 15884 | 677 | msn_actions(PurplePlugin *plugin, gpointer context) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
678 | { |
| 15884 | 679 | PurpleConnection *gc = (PurpleConnection *)context; |
| 680 | PurpleAccount *account; | |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
681 | const char *user; |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
682 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
683 | GList *m = NULL; |
| 15884 | 684 | PurplePluginAction *act; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
685 | |
| 15884 | 686 | act = purple_plugin_action_new(_("Set Friendly Name..."), |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
687 | msn_show_set_friendly_name); |
|
9015
3c27e9074fa2
[gaim-migrate @ 9791]
Christopher O'Brien <siege@pidgin.im>
parents:
8993
diff
changeset
|
688 | m = g_list_append(m, act); |
|
5364
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
689 | m = g_list_append(m, NULL); |
|
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
690 | |
| 15884 | 691 | act = purple_plugin_action_new(_("Set Home Phone Number..."), |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
692 | msn_show_set_home_phone); |
|
9015
3c27e9074fa2
[gaim-migrate @ 9791]
Christopher O'Brien <siege@pidgin.im>
parents:
8993
diff
changeset
|
693 | m = g_list_append(m, act); |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
694 | |
| 15884 | 695 | act = purple_plugin_action_new(_("Set Work Phone Number..."), |
|
9015
3c27e9074fa2
[gaim-migrate @ 9791]
Christopher O'Brien <siege@pidgin.im>
parents:
8993
diff
changeset
|
696 | msn_show_set_work_phone); |
|
3c27e9074fa2
[gaim-migrate @ 9791]
Christopher O'Brien <siege@pidgin.im>
parents:
8993
diff
changeset
|
697 | m = g_list_append(m, act); |
|
5363
b6e28be0c9bd
[gaim-migrate @ 5739]
Christian Hammond <chipx86@chipx86.com>
parents:
5361
diff
changeset
|
698 | |
| 15884 | 699 | act = purple_plugin_action_new(_("Set Mobile Phone Number..."), |
|
9015
3c27e9074fa2
[gaim-migrate @ 9791]
Christopher O'Brien <siege@pidgin.im>
parents:
8993
diff
changeset
|
700 | msn_show_set_mobile_phone); |
|
3c27e9074fa2
[gaim-migrate @ 9791]
Christopher O'Brien <siege@pidgin.im>
parents:
8993
diff
changeset
|
701 | m = g_list_append(m, act); |
|
5364
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
702 | m = g_list_append(m, NULL); |
|
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
703 | |
|
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
704 | #if 0 |
| 15884 | 705 | act = purple_plugin_action_new(_("Enable/Disable Mobile Devices..."), |
|
9015
3c27e9074fa2
[gaim-migrate @ 9791]
Christopher O'Brien <siege@pidgin.im>
parents:
8993
diff
changeset
|
706 | msn_show_set_mobile_support); |
|
3c27e9074fa2
[gaim-migrate @ 9791]
Christopher O'Brien <siege@pidgin.im>
parents:
8993
diff
changeset
|
707 | m = g_list_append(m, act); |
|
5364
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
708 | #endif |
|
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
709 | |
| 15884 | 710 | act = purple_plugin_action_new(_("Allow/Disallow Mobile Pages..."), |
|
9015
3c27e9074fa2
[gaim-migrate @ 9791]
Christopher O'Brien <siege@pidgin.im>
parents:
8993
diff
changeset
|
711 | msn_show_set_mobile_pages); |
|
3c27e9074fa2
[gaim-migrate @ 9791]
Christopher O'Brien <siege@pidgin.im>
parents:
8993
diff
changeset
|
712 | m = g_list_append(m, act); |
|
5364
d423753cfd63
[gaim-migrate @ 5740]
Christian Hammond <chipx86@chipx86.com>
parents:
5363
diff
changeset
|
713 | |
| 15884 | 714 | account = purple_connection_get_account(gc); |
| 715 | user = msn_normalize(account, purple_account_get_username(account)); | |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
716 | |
|
17255
a4f1d0f9b81b
Support for @msn.com accounts when opening Inbox, and unconditioanlly request
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17251
diff
changeset
|
717 | if ((strstr(user, "@hotmail.") != NULL) || |
|
a4f1d0f9b81b
Support for @msn.com accounts when opening Inbox, and unconditioanlly request
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17251
diff
changeset
|
718 | (strstr(user, "@msn.com") != NULL)) |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
719 | { |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
720 | m = g_list_append(m, NULL); |
| 15884 | 721 | act = purple_plugin_action_new(_("Open Hotmail Inbox"), |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
722 | msn_show_hotmail_inbox); |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
723 | m = g_list_append(m, act); |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
724 | } |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
725 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
726 | return m; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
727 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
728 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
729 | static GList * |
| 15884 | 730 | msn_buddy_menu(PurpleBuddy *buddy) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
731 | { |
|
5372
6fa63c80ea61
[gaim-migrate @ 5748]
Christian Hammond <chipx86@chipx86.com>
parents:
5369
diff
changeset
|
732 | MsnUser *user; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
733 | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
734 | GList *m = NULL; |
| 15884 | 735 | PurpleMenuAction *act; |
|
6858
a367cfd3e75f
[gaim-migrate @ 7403]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
736 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
737 | g_return_val_if_fail(buddy != NULL, NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
738 | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
739 | user = buddy->proto_data; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
740 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
741 | if (user != NULL) |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
742 | { |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
743 | if (user->mobile) |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
744 | { |
| 15884 | 745 | act = purple_menu_action_new(_("Send to Mobile"), |
| 746 | PURPLE_CALLBACK(show_send_to_mobile_cb), | |
| 12919 | 747 | NULL, NULL); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
748 | m = g_list_append(m, act); |
|
5382
8580140115ea
[gaim-migrate @ 5758]
Christian Hammond <chipx86@chipx86.com>
parents:
5379
diff
changeset
|
749 | } |
|
5369
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
750 | } |
|
12dc1957e1b2
[gaim-migrate @ 5745]
Christian Hammond <chipx86@chipx86.com>
parents:
5364
diff
changeset
|
751 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
752 | if (g_ascii_strcasecmp(buddy->name, |
| 15884 | 753 | purple_account_get_username(buddy->account))) |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
754 | { |
| 15884 | 755 | act = purple_menu_action_new(_("Initiate _Chat"), |
| 756 | PURPLE_CALLBACK(initiate_chat_cb), | |
| 12919 | 757 | NULL, NULL); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
758 | m = g_list_append(m, act); |
|
6148
e3e81ed229c2
[gaim-migrate @ 6622]
Christian Hammond <chipx86@chipx86.com>
parents:
6059
diff
changeset
|
759 | } |
|
e3e81ed229c2
[gaim-migrate @ 6622]
Christian Hammond <chipx86@chipx86.com>
parents:
6059
diff
changeset
|
760 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
761 | return m; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
762 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
763 | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
764 | static GList * |
| 15884 | 765 | msn_blist_node_menu(PurpleBlistNode *node) |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
766 | { |
| 15884 | 767 | if(PURPLE_BLIST_NODE_IS_BUDDY(node)) |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
768 | { |
| 15884 | 769 | return msn_buddy_menu((PurpleBuddy *) node); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
770 | } |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
771 | else |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
772 | { |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
773 | return NULL; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
774 | } |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
775 | } |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
776 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
777 | static void |
| 15884 | 778 | msn_login(PurpleAccount *account) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
779 | { |
| 15884 | 780 | PurpleConnection *gc; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
781 | MsnSession *session; |
|
5564
1779a1bfbdb8
[gaim-migrate @ 5966]
Christian Hammond <chipx86@chipx86.com>
parents:
5518
diff
changeset
|
782 | const char *username; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
783 | const char *host; |
|
7288
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
7277
diff
changeset
|
784 | gboolean http_method = FALSE; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
785 | int port; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
786 | |
| 15884 | 787 | gc = purple_account_get_connection(account); |
|
7277
30f81cac2e3a
[gaim-migrate @ 7856]
Christian Hammond <chipx86@chipx86.com>
parents:
7262
diff
changeset
|
788 | |
| 15884 | 789 | if (!purple_ssl_is_supported()) |
|
7277
30f81cac2e3a
[gaim-migrate @ 7856]
Christian Hammond <chipx86@chipx86.com>
parents:
7262
diff
changeset
|
790 | { |
|
10914
b36341f695d6
[gaim-migrate @ 12671]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10796
diff
changeset
|
791 | gc->wants_to_die = TRUE; |
| 15884 | 792 | purple_connection_error(gc, |
| 8499 | 793 | _("SSL support is needed for MSN. Please install a supported " |
|
15498
2ee3112b6f24
This should be the last of the string changes
Sean Egan <seanegan@pidgin.im>
parents:
15444
diff
changeset
|
794 | "SSL library.")); |
|
7277
30f81cac2e3a
[gaim-migrate @ 7856]
Christian Hammond <chipx86@chipx86.com>
parents:
7262
diff
changeset
|
795 | return; |
|
30f81cac2e3a
[gaim-migrate @ 7856]
Christian Hammond <chipx86@chipx86.com>
parents:
7262
diff
changeset
|
796 | } |
|
30f81cac2e3a
[gaim-migrate @ 7856]
Christian Hammond <chipx86@chipx86.com>
parents:
7262
diff
changeset
|
797 | |
| 15884 | 798 | http_method = purple_account_get_bool(account, "http_method", FALSE); |
|
7288
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
7277
diff
changeset
|
799 | |
| 15884 | 800 | host = purple_account_get_string(account, "server", MSN_SERVER); |
| 801 | port = purple_account_get_int(account, "port", MSN_PORT); | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
802 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
803 | session = msn_session_new(account); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
804 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
805 | gc->proto_data = session; |
| 15884 | 806 | gc->flags |= PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_FORMATTING_WBFO | PURPLE_CONNECTION_NO_BGCOLOR | PURPLE_CONNECTION_NO_FONTSIZE | PURPLE_CONNECTION_NO_URLDESC; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
807 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
808 | msn_session_set_login_step(session, MSN_LOGIN_STEP_START); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
809 | |
|
5564
1779a1bfbdb8
[gaim-migrate @ 5966]
Christian Hammond <chipx86@chipx86.com>
parents:
5518
diff
changeset
|
810 | /* Hmm, I don't like this. */ |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
811 | /* XXX shx: Me neither */ |
| 15884 | 812 | username = msn_normalize(account, purple_account_get_username(account)); |
|
5564
1779a1bfbdb8
[gaim-migrate @ 5966]
Christian Hammond <chipx86@chipx86.com>
parents:
5518
diff
changeset
|
813 | |
| 15884 | 814 | if (strcmp(username, purple_account_get_username(account))) |
| 815 | purple_account_set_username(account, username); | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
816 | |
|
10568
15f02c0e7fc1
[gaim-migrate @ 11954]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10533
diff
changeset
|
817 | if (!msn_session_connect(session, host, port, http_method)) |
| 15884 | 818 | purple_connection_error(gc, _("Failed to connect to server.")); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
819 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
820 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
821 | static void |
| 15884 | 822 | msn_close(PurpleConnection *gc) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
823 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
824 | MsnSession *session; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
825 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
826 | session = gc->proto_data; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
827 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
828 | g_return_if_fail(session != NULL); |
|
8298
eb6f1096ffa6
[gaim-migrate @ 9022]
Christian Hammond <chipx86@chipx86.com>
parents:
8291
diff
changeset
|
829 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
830 | msn_session_destroy(session); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
831 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
832 | gc->proto_data = NULL; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
833 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
834 | |
|
17103
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
835 | static gboolean |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
836 | msn_send_me_im(gpointer data) |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
837 | { |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
838 | MsnIMData *imdata = data; |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
839 | serv_got_im(imdata->gc, imdata->who, imdata->msg, imdata->flags, imdata->when); |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
840 | g_free(imdata->msg); |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
841 | g_free(imdata); |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
842 | return FALSE; |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
843 | } |
|
d7806e6686a7
In MSN we fake sending messages to yourself. This had a small bug in that
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17089
diff
changeset
|
844 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
845 | static int |
| 15884 | 846 | msn_send_im(PurpleConnection *gc, const char *who, const char *message, |
| 847 | PurpleMessageFlags flags) | |
| 2086 | 848 | { |
| 15884 | 849 | PurpleAccount *account; |
| 850 | PurpleBuddy *buddy = purple_find_buddy(gc->account, who); | |
|
10275
186d84a66cc3
[gaim-migrate @ 11428]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10274
diff
changeset
|
851 | MsnMessage *msg; |
|
186d84a66cc3
[gaim-migrate @ 11428]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10274
diff
changeset
|
852 | char *msgformat; |
|
186d84a66cc3
[gaim-migrate @ 11428]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10274
diff
changeset
|
853 | char *msgtext; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
854 | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
855 | purple_debug_info("MaYuan","send IM {%s} to %s\n",message,who); |
| 15884 | 856 | account = purple_connection_get_account(gc); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
857 | |
|
15602
6d1d20a9e297
This is my attempt at MSN mobile status, but I suspect MSN mobile status doesn't exist. If it's confirmed that it doesn't, I'll revert this. But I want to keep it for posterity, in case it does exist
Sean Egan <seanegan@pidgin.im>
parents:
15524
diff
changeset
|
858 | if (buddy) { |
| 15884 | 859 | PurplePresence *p = purple_buddy_get_presence(buddy); |
| 860 | if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOBILE)) { | |
| 861 | char *text = purple_markup_strip_html(message); | |
|
15602
6d1d20a9e297
This is my attempt at MSN mobile status, but I suspect MSN mobile status doesn't exist. If it's confirmed that it doesn't, I'll revert this. But I want to keep it for posterity, in case it does exist
Sean Egan <seanegan@pidgin.im>
parents:
15524
diff
changeset
|
862 | send_to_mobile(gc, who, text); |
|
6d1d20a9e297
This is my attempt at MSN mobile status, but I suspect MSN mobile status doesn't exist. If it's confirmed that it doesn't, I'll revert this. But I want to keep it for posterity, in case it does exist
Sean Egan <seanegan@pidgin.im>
parents:
15524
diff
changeset
|
863 | g_free(text); |
|
15654
fb4e6617313e
Get rid of a minor compile warning
Mark Doliner <markdoliner@pidgin.im>
parents:
15602
diff
changeset
|
864 | return 1; |
|
15602
6d1d20a9e297
This is my attempt at MSN mobile status, but I suspect MSN mobile status doesn't exist. If it's confirmed that it doesn't, I'll revert this. But I want to keep it for posterity, in case it does exist
Sean Egan <seanegan@pidgin.im>
parents:
15524
diff
changeset
|
865 | } |
|
6d1d20a9e297
This is my attempt at MSN mobile status, but I suspect MSN mobile status doesn't exist. If it's confirmed that it doesn't, I'll revert this. But I want to keep it for posterity, in case it does exist
Sean Egan <seanegan@pidgin.im>
parents:
15524
diff
changeset
|
866 | } |
|
6d1d20a9e297
This is my attempt at MSN mobile status, but I suspect MSN mobile status doesn't exist. If it's confirmed that it doesn't, I'll revert this. But I want to keep it for posterity, in case it does exist
Sean Egan <seanegan@pidgin.im>
parents:
15524
diff
changeset
|
867 | |
|
10275
186d84a66cc3
[gaim-migrate @ 11428]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10274
diff
changeset
|
868 | msn_import_html(message, &msgformat, &msgtext); |
| 13900 | 869 | if(msn_user_is_online(account, who)|| |
| 870 | msn_user_is_yahoo(account, who)){ | |
| 13893 | 871 | /*User online,then send Online Instant Message*/ |
|
10275
186d84a66cc3
[gaim-migrate @ 11428]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10274
diff
changeset
|
872 | |
| 13893 | 873 | if (strlen(msgtext) + strlen(msgformat) + strlen(VERSION) > 1564) |
| 874 | { | |
| 875 | g_free(msgformat); | |
| 876 | g_free(msgtext); | |
| 877 | ||
| 878 | return -E2BIG; | |
|
15602
6d1d20a9e297
This is my attempt at MSN mobile status, but I suspect MSN mobile status doesn't exist. If it's confirmed that it doesn't, I'll revert this. But I want to keep it for posterity, in case it does exist
Sean Egan <seanegan@pidgin.im>
parents:
15524
diff
changeset
|
879 | } |
|
6d1d20a9e297
This is my attempt at MSN mobile status, but I suspect MSN mobile status doesn't exist. If it's confirmed that it doesn't, I'll revert this. But I want to keep it for posterity, in case it does exist
Sean Egan <seanegan@pidgin.im>
parents:
15524
diff
changeset
|
880 | |
| 13893 | 881 | msg = msn_message_new_plain(msgtext); |
| 882 | msg->remote_user = g_strdup(who); | |
| 883 | msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat); | |
|
10275
186d84a66cc3
[gaim-migrate @ 11428]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10274
diff
changeset
|
884 | |
|
186d84a66cc3
[gaim-migrate @ 11428]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10274
diff
changeset
|
885 | g_free(msgformat); |
|
186d84a66cc3
[gaim-migrate @ 11428]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10274
diff
changeset
|
886 | g_free(msgtext); |
|
186d84a66cc3
[gaim-migrate @ 11428]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10274
diff
changeset
|
887 | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
888 | purple_debug_info("MaYuan","prepare to send online Message\n"); |
|
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
889 | if (g_ascii_strcasecmp(who, purple_account_get_username(account))) |
| 13893 | 890 | { |
| 891 | MsnSession *session; | |
| 892 | MsnSwitchBoard *swboard; | |
|
10275
186d84a66cc3
[gaim-migrate @ 11428]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10274
diff
changeset
|
893 | |
| 13893 | 894 | session = gc->proto_data; |
| 13900 | 895 | if(msn_user_is_yahoo(account,who)){ |
| 896 | /*we send the online and offline Message to Yahoo User via UBM*/ | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
897 | purple_debug_info("MaYuan","send to Yahoo User\n"); |
| 13893 | 898 | uum_send_msg(session,msg); |
| 899 | }else{ | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
900 | purple_debug_info("MaYuan","send via switchboard\n"); |
| 13893 | 901 | swboard = msn_session_get_swboard(session, who, MSN_SB_FLAG_IM); |
| 902 | msn_switchboard_send_msg(swboard, msg, TRUE); | |
| 903 | } | |
| 904 | } | |
| 905 | else | |
| 906 | { | |
| 907 | char *body_str, *body_enc, *pre, *post; | |
| 908 | const char *format; | |
| 20496 | 909 | MsnIMData *imdata = g_new0(MsnIMData, 1); |
| 13893 | 910 | /* |
| 911 | * In MSN, you can't send messages to yourself, so | |
| 912 | * we'll fake like we received it ;) | |
| 913 | */ | |
| 914 | body_str = msn_message_to_string(msg); | |
| 915 | body_enc = g_markup_escape_text(body_str, -1); | |
| 916 | g_free(body_str); | |
|
10275
186d84a66cc3
[gaim-migrate @ 11428]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10274
diff
changeset
|
917 | |
| 13893 | 918 | format = msn_message_get_attr(msg, "X-MMS-IM-Format"); |
| 919 | msn_parse_format(format, &pre, &post); | |
| 920 | body_str = g_strdup_printf("%s%s%s", pre ? pre : "", | |
| 921 | body_enc ? body_enc : "", post ? post : ""); | |
| 922 | g_free(body_enc); | |
| 923 | g_free(pre); | |
| 924 | g_free(post); | |
| 925 | ||
| 926 | serv_got_typing_stopped(gc, who); | |
| 20496 | 927 | imdata->gc = gc; |
| 928 | imdata->who = who; | |
| 929 | imdata->msg = body_str; | |
| 930 | imdata->flags = flags; | |
| 931 | imdata->when = time(NULL); | |
| 932 | g_idle_add(msn_send_me_im, imdata); | |
| 13893 | 933 | } |
|
8595
c751f6b0260e
[gaim-migrate @ 9346]
Christian Hammond <chipx86@chipx86.com>
parents:
8591
diff
changeset
|
934 | |
| 13893 | 935 | msn_message_destroy(msg); |
| 936 | }else { | |
| 13900 | 937 | /*send Offline Instant Message,only to MSN Passport User*/ |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
938 | MsnSession *session; |
| 13893 | 939 | MsnOim *oim; |
| 940 | char *friendname; | |
|
20508
a8855578906a
Revert a bunch of whitespace changes so reviewing a diff against
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20505
diff
changeset
|
941 | |
|
a8855578906a
Revert a bunch of whitespace changes so reviewing a diff against
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20505
diff
changeset
|
942 | purple_debug_info("MaYuan","prepare to send offline Message\n"); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
943 | session = gc->proto_data; |
|
20473
91e1b3a49d10
msn.tgz from SF Patch #1621854 from Ka-Hing Cheung
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
944 | /* XXX/khc: hack */ |
|
91e1b3a49d10
msn.tgz from SF Patch #1621854 from Ka-Hing Cheung
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
945 | if (!session->oim) |
|
91e1b3a49d10
msn.tgz from SF Patch #1621854 from Ka-Hing Cheung
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
946 | session->oim = msn_oim_new(session); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
947 | |
| 13893 | 948 | oim = session->oim; |
| 13898 | 949 | friendname = msn_encode_mime(account->username); |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
950 | msn_oim_prep_send_msg_info(oim, purple_account_get_username(account), |
|
20474
b0ef257ef8d4
The second msn.tgz from SF Patch #1621854 from Ka-Hing Cheung.
Ka-Hing Cheung <khc@pidgin.im>
parents:
20473
diff
changeset
|
951 | friendname, who, message); |
| 13893 | 952 | msn_oim_send_msg(oim); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
953 | } |
|
10275
186d84a66cc3
[gaim-migrate @ 11428]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10274
diff
changeset
|
954 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
955 | return 1; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
956 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
957 | |
|
13844
835b8f7b3d1d
[gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents:
13713
diff
changeset
|
958 | static unsigned int |
| 15884 | 959 | msn_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
960 | { |
| 15884 | 961 | PurpleAccount *account; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
962 | MsnSession *session; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
963 | MsnSwitchBoard *swboard; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
964 | MsnMessage *msg; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
965 | |
| 15884 | 966 | account = purple_connection_get_account(gc); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
967 | session = gc->proto_data; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
968 | |
|
13844
835b8f7b3d1d
[gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents:
13713
diff
changeset
|
969 | /* |
| 15884 | 970 | * TODO: I feel like this should be "if (state != PURPLE_TYPING)" |
|
13844
835b8f7b3d1d
[gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents:
13713
diff
changeset
|
971 | * but this is how it was before, and I don't want to break |
|
835b8f7b3d1d
[gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents:
13713
diff
changeset
|
972 | * anything. --KingAnt |
|
835b8f7b3d1d
[gaim-migrate @ 16295]
Mark Doliner <markdoliner@pidgin.im>
parents:
13713
diff
changeset
|
973 | */ |
| 15884 | 974 | if (state == PURPLE_NOT_TYPING) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
975 | return 0; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
976 | |
| 15884 | 977 | if (!g_ascii_strcasecmp(who, purple_account_get_username(account))) |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
978 | { |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
979 | /* We'll just fake it, since we're sending to ourself. */ |
| 15884 | 980 | serv_got_typing(gc, who, MSN_TYPING_RECV_TIMEOUT, PURPLE_TYPING); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
981 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
982 | return MSN_TYPING_SEND_TIMEOUT; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
983 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
984 | |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
985 | swboard = msn_session_find_swboard(session, who); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
986 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
987 | if (swboard == NULL || !msn_switchboard_can_send(swboard)) |
|
10346
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
988 | return 0; |
|
9c65a007b4a5
[gaim-migrate @ 11560]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
989 | |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10738
diff
changeset
|
990 | swboard->flag |= MSN_SB_FLAG_IM; |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10738
diff
changeset
|
991 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10116
diff
changeset
|
992 | msg = msn_message_new(MSN_MSG_TYPING); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
993 | msn_message_set_content_type(msg, "text/x-msmsgscontrol"); |
|
5505
176c91a635b7
[gaim-migrate @ 5904]
Christian Hammond <chipx86@chipx86.com>
parents:
5498
diff
changeset
|
994 | msn_message_set_flag(msg, 'U'); |
|
5564
1779a1bfbdb8
[gaim-migrate @ 5966]
Christian Hammond <chipx86@chipx86.com>
parents:
5518
diff
changeset
|
995 | msn_message_set_attr(msg, "TypingUser", |
| 15884 | 996 | purple_account_get_username(account)); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
997 | msn_message_set_bin_data(msg, "\r\n", 2); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
998 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
999 | msn_switchboard_send_msg(swboard, msg, FALSE); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1000 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
1001 | msn_message_destroy(msg); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1002 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1003 | return MSN_TYPING_SEND_TIMEOUT; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1004 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1005 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1006 | static void |
| 15884 | 1007 | msn_set_status(PurpleAccount *account, PurpleStatus *status) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1008 | { |
| 15884 | 1009 | PurpleConnection *gc; |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11920
diff
changeset
|
1010 | MsnSession *session; |
|
9967
7400b348ff62
[gaim-migrate @ 10877]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9953
diff
changeset
|
1011 | |
| 15884 | 1012 | gc = purple_account_get_connection(account); |
|
9967
7400b348ff62
[gaim-migrate @ 10877]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9953
diff
changeset
|
1013 | |
|
11028
b3568dd036a9
[gaim-migrate @ 12906]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10914
diff
changeset
|
1014 | if (gc != NULL) |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11920
diff
changeset
|
1015 | { |
| 10646 | 1016 | session = gc->proto_data; |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11920
diff
changeset
|
1017 | msn_change_status(session); |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11920
diff
changeset
|
1018 | } |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1019 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1020 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1021 | static void |
| 15884 | 1022 | msn_set_idle(PurpleConnection *gc, int idle) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1023 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1024 | MsnSession *session; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1025 | |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1026 | session = gc->proto_data; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1027 | |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11920
diff
changeset
|
1028 | msn_change_status(session); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1029 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1030 | |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11920
diff
changeset
|
1031 | #if 0 |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1032 | static void |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1033 | fake_userlist_add_buddy(MsnUserList *userlist, |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1034 | const char *who, int list_id, |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1035 | const char *group_name) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1036 | { |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1037 | MsnUser *user; |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1038 | static int group_id_c = 1; |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1039 | int group_id; |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1040 | |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1041 | group_id = -1; |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1042 | |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1043 | if (group_name != NULL) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1044 | { |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1045 | MsnGroup *group; |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1046 | group = msn_group_new(userlist, group_id_c, group_name); |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1047 | group_id = group_id_c++; |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1048 | } |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1049 | |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1050 | user = msn_userlist_find_user(userlist, who); |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1051 | |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1052 | if (user == NULL) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1053 | { |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1054 | user = msn_user_new(userlist, who, NULL); |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1055 | msn_userlist_add_user(userlist, user); |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1056 | } |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1057 | else |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1058 | if (user->list_op & (1 << list_id)) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1059 | { |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1060 | if (list_id == MSN_LIST_FL) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1061 | { |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1062 | if (group_id >= 0) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1063 | if (g_list_find(user->group_ids, |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1064 | GINT_TO_POINTER(group_id))) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1065 | return; |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1066 | } |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1067 | else |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1068 | return; |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1069 | } |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1070 | |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1071 | if (group_id >= 0) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1072 | { |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1073 | user->group_ids = g_list_append(user->group_ids, |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1074 | GINT_TO_POINTER(group_id)); |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1075 | } |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1076 | |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1077 | user->list_op |= (1 << list_id); |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1078 | } |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11920
diff
changeset
|
1079 | #endif |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1080 | |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1081 | static void |
| 15884 | 1082 | msn_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1083 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1084 | MsnSession *session; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1085 | MsnUserList *userlist; |
| 7261 | 1086 | const char *who; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1087 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1088 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1089 | userlist = session->userlist; |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
9246
diff
changeset
|
1090 | who = msn_normalize(gc->account, buddy->name); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1091 | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
1092 | purple_debug_info("MaYuan","add user:{%s} to group:{%s}\n",who,group->name); |
|
9363
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1093 | if (!session->logged_in) |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1094 | { |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11920
diff
changeset
|
1095 | #if 0 |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1096 | fake_userlist_add_buddy(session->sync_userlist, who, MSN_LIST_FL, |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1097 | group ? group->name : NULL); |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11920
diff
changeset
|
1098 | #else |
| 15884 | 1099 | purple_debug_error("msn", "msn_add_buddy called before connected\n"); |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11920
diff
changeset
|
1100 | #endif |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1101 | |
|
9363
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1102 | return; |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1103 | } |
|
9363
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1104 | |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1105 | #if 0 |
|
9290
093382f25d5e
[gaim-migrate @ 10093]
Christian Hammond <chipx86@chipx86.com>
parents:
9285
diff
changeset
|
1106 | if (group != NULL && group->name != NULL) |
| 15884 | 1107 | purple_debug_info("msn", "msn_add_buddy: %s, %s\n", who, group->name); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1108 | else |
| 15884 | 1109 | purple_debug_info("msn", "msn_add_buddy: %s\n", who); |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1110 | #endif |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1111 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1112 | #if 0 |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1113 | /* Which is the max? */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1114 | if (session->fl_users_count >= 150) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1115 | { |
| 15884 | 1116 | purple_debug_info("msn", "Too many buddies\n"); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1117 | /* Buddy list full */ |
| 15884 | 1118 | /* TODO: purple should be notified of this */ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1119 | return; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1120 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1121 | #endif |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
1122 | |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1123 | /* XXX - Would group ever be NULL here? I don't think so... |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1124 | * shx: Yes it should; MSN handles non-grouped buddies, and this is only |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1125 | * internal. */ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1126 | msn_userlist_add_buddy(userlist, who, MSN_LIST_FL, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1127 | group ? group->name : NULL); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1128 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1129 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1130 | static void |
| 15884 | 1131 | msn_rem_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1132 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1133 | MsnSession *session; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1134 | MsnUserList *userlist; |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
1135 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1136 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1137 | userlist = session->userlist; |
|
9091
8c3907d0f436
[gaim-migrate @ 9868]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9086
diff
changeset
|
1138 | |
|
9363
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1139 | if (!session->logged_in) |
|
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1140 | return; |
|
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1141 | |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
9246
diff
changeset
|
1142 | /* XXX - Does buddy->name need to be msn_normalize'd here? --KingAnt */ |
|
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
9246
diff
changeset
|
1143 | msn_userlist_rem_buddy(userlist, buddy->name, MSN_LIST_FL, group->name); |
| 2086 | 1144 | } |
| 1145 | ||
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1146 | static void |
| 15884 | 1147 | msn_add_permit(PurpleConnection *gc, const char *who) |
| 2086 | 1148 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1149 | MsnSession *session; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1150 | MsnUserList *userlist; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1151 | MsnUser *user; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1152 | |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1153 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1154 | userlist = session->userlist; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1155 | user = msn_userlist_find_user(userlist, who); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1156 | |
|
9363
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1157 | if (!session->logged_in) |
|
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1158 | return; |
|
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1159 | |
|
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1160 | if (user != NULL && user->list_op & MSN_LIST_BL_OP) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1161 | msn_userlist_rem_buddy(userlist, who, MSN_LIST_BL, NULL); |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
1162 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1163 | msn_userlist_add_buddy(userlist, who, MSN_LIST_AL, NULL); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1164 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1165 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1166 | static void |
| 15884 | 1167 | msn_add_deny(PurpleConnection *gc, const char *who) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1168 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1169 | MsnSession *session; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1170 | MsnUserList *userlist; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1171 | MsnUser *user; |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
1172 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1173 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1174 | userlist = session->userlist; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1175 | user = msn_userlist_find_user(userlist, who); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1176 | |
|
9363
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1177 | if (!session->logged_in) |
|
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1178 | return; |
|
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1179 | |
|
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1180 | if (user != NULL && user->list_op & MSN_LIST_AL_OP) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1181 | msn_userlist_rem_buddy(userlist, who, MSN_LIST_AL, NULL); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1182 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1183 | msn_userlist_add_buddy(userlist, who, MSN_LIST_BL, NULL); |
| 2086 | 1184 | } |
| 1185 | ||
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1186 | static void |
| 15884 | 1187 | msn_rem_permit(PurpleConnection *gc, const char *who) |
| 2086 | 1188 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1189 | MsnSession *session; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1190 | MsnUserList *userlist; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1191 | MsnUser *user; |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
1192 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1193 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1194 | userlist = session->userlist; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1195 | |
|
9363
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1196 | if (!session->logged_in) |
|
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1197 | return; |
|
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1198 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1199 | user = msn_userlist_find_user(userlist, who); |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
1200 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1201 | msn_userlist_rem_buddy(userlist, who, MSN_LIST_AL, NULL); |
| 2086 | 1202 | |
|
9363
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1203 | if (user != NULL && user->list_op & MSN_LIST_RL_OP) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1204 | msn_userlist_add_buddy(userlist, who, MSN_LIST_BL, NULL); |
| 2086 | 1205 | } |
| 1206 | ||
|
12323
f52908fb23b0
[gaim-migrate @ 14627]
Richard Laager <rlaager@pidgin.im>
parents:
12318
diff
changeset
|
1207 | static void |
| 15884 | 1208 | msn_rem_deny(PurpleConnection *gc, const char *who) |
| 2086 | 1209 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1210 | MsnSession *session; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1211 | MsnUserList *userlist; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1212 | MsnUser *user; |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
1213 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1214 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1215 | userlist = session->userlist; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1216 | |
|
9363
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1217 | if (!session->logged_in) |
|
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1218 | return; |
|
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1219 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1220 | user = msn_userlist_find_user(userlist, who); |
|
2213
3a176de28de1
[gaim-migrate @ 2223]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2210
diff
changeset
|
1221 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1222 | msn_userlist_rem_buddy(userlist, who, MSN_LIST_BL, NULL); |
| 7563 | 1223 | |
|
9363
605961038476
[gaim-migrate @ 10171]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9318
diff
changeset
|
1224 | if (user != NULL && user->list_op & MSN_LIST_RL_OP) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1225 | msn_userlist_add_buddy(userlist, who, MSN_LIST_AL, NULL); |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1226 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1227 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1228 | static void |
| 15884 | 1229 | msn_set_permit_deny(PurpleConnection *gc) |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1230 | { |
| 15884 | 1231 | PurpleAccount *account; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1232 | MsnSession *session; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1233 | MsnCmdProc *cmdproc; |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1234 | |
| 15884 | 1235 | account = purple_connection_get_account(gc); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1236 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1237 | cmdproc = session->notification->cmdproc; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1238 | |
| 15884 | 1239 | if (account->perm_deny == PURPLE_PRIVACY_ALLOW_ALL || |
| 1240 | account->perm_deny == PURPLE_PRIVACY_DENY_USERS) | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1241 | { |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1242 | msn_cmdproc_send(cmdproc, "BLP", "%s", "AL"); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1243 | } |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1244 | else |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1245 | { |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1246 | msn_cmdproc_send(cmdproc, "BLP", "%s", "BL"); |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1247 | } |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1248 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1249 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1250 | static void |
| 15884 | 1251 | msn_chat_invite(PurpleConnection *gc, int id, const char *msg, |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1252 | const char *who) |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1253 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1254 | MsnSession *session; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1255 | MsnSwitchBoard *swboard; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1256 | |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1257 | session = gc->proto_data; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
1258 | |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1259 | swboard = msn_session_find_swboard_with_id(session, id); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1260 | |
|
10533
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
1261 | if (swboard == NULL) |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
1262 | { |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
1263 | /* if we have no switchboard, everyone else left the chat already */ |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
1264 | swboard = msn_switchboard_new(session); |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
1265 | msn_switchboard_request(swboard); |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
1266 | swboard->chat_id = id; |
| 15884 | 1267 | swboard->conv = purple_find_chat(gc, id); |
|
10533
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
1268 | } |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1269 | |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10738
diff
changeset
|
1270 | swboard->flag |= MSN_SB_FLAG_IM; |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10738
diff
changeset
|
1271 | |
|
10533
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
1272 | msn_switchboard_request_add_user(swboard, who); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1273 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1274 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1275 | static void |
| 15884 | 1276 | msn_chat_leave(PurpleConnection *gc, int id) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1277 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1278 | MsnSession *session; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1279 | MsnSwitchBoard *swboard; |
| 15884 | 1280 | PurpleConversation *conv; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1281 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1282 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1283 | |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1284 | swboard = msn_session_find_swboard_with_id(session, id); |
|
10533
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
1285 | |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
1286 | /* if swboard is NULL we were the only person left anyway */ |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
1287 | if (swboard == NULL) |
|
4c2ad22fad20
[gaim-migrate @ 11862]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10504
diff
changeset
|
1288 | return; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1289 | |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1290 | conv = swboard->conv; |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1291 | |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10738
diff
changeset
|
1292 | msn_switchboard_release(swboard, MSN_SB_FLAG_IM); |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1293 | |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1294 | /* If other switchboards managed to associate themselves with this |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1295 | * conv, make sure they know it's gone! */ |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1296 | if (conv != NULL) |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1297 | { |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1298 | while ((swboard = msn_session_find_swboard_with_conv(session, conv)) != NULL) |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1299 | swboard->conv = NULL; |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1300 | } |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1301 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1302 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1303 | static int |
| 15884 | 1304 | msn_chat_send(PurpleConnection *gc, int id, const char *message, PurpleMessageFlags flags) |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1305 | { |
| 15884 | 1306 | PurpleAccount *account; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1307 | MsnSession *session; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1308 | MsnSwitchBoard *swboard; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1309 | MsnMessage *msg; |
|
8922
6928d9a0338b
[gaim-migrate @ 9692]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8808
diff
changeset
|
1310 | char *msgformat; |
|
6928d9a0338b
[gaim-migrate @ 9692]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8808
diff
changeset
|
1311 | char *msgtext; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1312 | |
| 15884 | 1313 | account = purple_connection_get_account(gc); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1314 | session = gc->proto_data; |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1315 | swboard = msn_session_find_swboard_with_id(session, id); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1316 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1317 | if (swboard == NULL) |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1318 | return -EINVAL; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1319 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1320 | if (!swboard->ready) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1321 | return 0; |
|
10274
f329b1d7fd43
[gaim-migrate @ 11424]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
1322 | |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10738
diff
changeset
|
1323 | swboard->flag |= MSN_SB_FLAG_IM; |
|
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10738
diff
changeset
|
1324 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1325 | msn_import_html(message, &msgformat, &msgtext); |
|
10274
f329b1d7fd43
[gaim-migrate @ 11424]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
1326 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1327 | if (strlen(msgtext) + strlen(msgformat) + strlen(VERSION) > 1564) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1328 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1329 | g_free(msgformat); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1330 | g_free(msgtext); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1331 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1332 | return -E2BIG; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1333 | } |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1334 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1335 | msg = msn_message_new_plain(msgtext); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1336 | msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat); |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
1337 | msn_switchboard_send_msg(swboard, msg, FALSE); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1338 | msn_message_destroy(msg); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1339 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1340 | g_free(msgformat); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1341 | g_free(msgtext); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1342 | |
| 15884 | 1343 | serv_got_chat_in(gc, id, purple_account_get_username(account), 0, |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1344 | message, time(NULL)); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10306
diff
changeset
|
1345 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1346 | return 0; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1347 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1348 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1349 | static void |
| 15884 | 1350 | msn_keepalive(PurpleConnection *gc) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1351 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1352 | MsnSession *session; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1353 | |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1354 | session = gc->proto_data; |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10463
diff
changeset
|
1355 | |
|
10602
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
1356 | if (!session->http_method) |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
1357 | { |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
1358 | MsnCmdProc *cmdproc; |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1359 | |
|
10602
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
1360 | cmdproc = session->notification->cmdproc; |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
1361 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1362 | msn_cmdproc_send_quick(cmdproc, "PNG", NULL, NULL); |
|
10602
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
1363 | } |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1364 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1365 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1366 | static void |
| 15884 | 1367 | msn_group_buddy(PurpleConnection *gc, const char *who, |
|
5518
436fb9490b62
[gaim-migrate @ 5918]
Christian Hammond <chipx86@chipx86.com>
parents:
5507
diff
changeset
|
1368 | const char *old_group_name, const char *new_group_name) |
|
5318
2073a19f4217
[gaim-migrate @ 5690]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
1369 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1370 | MsnSession *session; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1371 | MsnUserList *userlist; |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
1372 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1373 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1374 | userlist = session->userlist; |
|
5518
436fb9490b62
[gaim-migrate @ 5918]
Christian Hammond <chipx86@chipx86.com>
parents:
5507
diff
changeset
|
1375 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1376 | msn_userlist_move_buddy(userlist, who, old_group_name, new_group_name); |
|
5318
2073a19f4217
[gaim-migrate @ 5690]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
1377 | } |
|
2073a19f4217
[gaim-migrate @ 5690]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
1378 | |
|
2073a19f4217
[gaim-migrate @ 5690]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
1379 | static void |
| 15884 | 1380 | msn_rename_group(PurpleConnection *gc, const char *old_name, |
| 1381 | PurpleGroup *group, GList *moved_buddies) | |
|
5318
2073a19f4217
[gaim-migrate @ 5690]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
1382 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1383 | MsnSession *session; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1384 | MsnCmdProc *cmdproc; |
| 13856 | 1385 | const char *old_gid; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
1386 | const char *enc_new_group_name; |
|
5318
2073a19f4217
[gaim-migrate @ 5690]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
1387 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1388 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1389 | cmdproc = session->notification->cmdproc; |
| 15884 | 1390 | enc_new_group_name = purple_url_encode(group->name); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1391 | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
1392 | purple_debug_info("MaYuan","rename group:old{%s},new{%s}",old_name,enc_new_group_name); |
|
9285
9cedf5d26577
[gaim-migrate @ 10088]
Mark Doliner <markdoliner@pidgin.im>
parents:
9246
diff
changeset
|
1393 | old_gid = msn_userlist_find_group_id(session->userlist, old_name); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1394 | |
|
20508
a8855578906a
Revert a bunch of whitespace changes so reviewing a diff against
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20505
diff
changeset
|
1395 | if (old_gid != NULL) |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1396 | { |
| 13856 | 1397 | /*find a Group*/ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1398 | msn_cmdproc_send(cmdproc, "REG", "%d %s 0", old_gid, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1399 | enc_new_group_name); |
|
5318
2073a19f4217
[gaim-migrate @ 5690]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
1400 | } |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1401 | else |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1402 | { |
| 13856 | 1403 | /*not found*/ |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
1404 | msn_cmdproc_send(cmdproc, "ADG", "%s 0", enc_new_group_name); |
|
5318
2073a19f4217
[gaim-migrate @ 5690]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
1405 | } |
|
2073a19f4217
[gaim-migrate @ 5690]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
1406 | } |
|
2073a19f4217
[gaim-migrate @ 5690]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
1407 | |
|
2073a19f4217
[gaim-migrate @ 5690]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
1408 | static void |
| 15884 | 1409 | msn_convo_closed(PurpleConnection *gc, const char *who) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1410 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1411 | MsnSession *session; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
1412 | MsnSwitchBoard *swboard; |
| 15884 | 1413 | PurpleConversation *conv; |
|
6026
b11d9f2fd725
[gaim-migrate @ 6476]
Christian Hammond <chipx86@chipx86.com>
parents:
6024
diff
changeset
|
1414 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1415 | session = gc->proto_data; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
1416 | |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1417 | swboard = msn_session_find_swboard(session, who); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1418 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1419 | /* |
|
10602
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
1420 | * Don't perform an assertion here. If swboard is NULL, then the |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1421 | * switchboard was either closed by the other party, or the person |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1422 | * is talking to himself. |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1423 | */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1424 | if (swboard == NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1425 | return; |
| 4349 | 1426 | |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1427 | conv = swboard->conv; |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1428 | |
|
17290
8807cc2337f4
When closing IM windows on MSN, don't release the switchboard connection
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17259
diff
changeset
|
1429 | /* If we release the switchboard here, it may still have messages |
|
8807cc2337f4
When closing IM windows on MSN, don't release the switchboard connection
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17259
diff
changeset
|
1430 | pending ACK which would result in incorrect unsent message errors. |
|
8807cc2337f4
When closing IM windows on MSN, don't release the switchboard connection
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17259
diff
changeset
|
1431 | Just let it timeout... This is *so* going to screw with people who |
|
8807cc2337f4
When closing IM windows on MSN, don't release the switchboard connection
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17259
diff
changeset
|
1432 | use dumb clients that report "User has closed the conversation window" */ |
|
8807cc2337f4
When closing IM windows on MSN, don't release the switchboard connection
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17259
diff
changeset
|
1433 | /* msn_switchboard_release(swboard, MSN_SB_FLAG_IM); */ |
|
8807cc2337f4
When closing IM windows on MSN, don't release the switchboard connection
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17259
diff
changeset
|
1434 | swboard->conv = NULL; |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1435 | |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1436 | /* If other switchboards managed to associate themselves with this |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1437 | * conv, make sure they know it's gone! */ |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1438 | if (conv != NULL) |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1439 | { |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1440 | while ((swboard = msn_session_find_swboard_with_conv(session, conv)) != NULL) |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1441 | swboard->conv = NULL; |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
1442 | } |
|
2597
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1443 | } |
|
51ca3fb939c9
[gaim-migrate @ 2610]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2591
diff
changeset
|
1444 | |
| 6516 | 1445 | static void |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16437
diff
changeset
|
1446 | msn_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img) |
|
7590
54b26062c7e0
[gaim-migrate @ 8208]
Christian Hammond <chipx86@chipx86.com>
parents:
7563
diff
changeset
|
1447 | { |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
1448 | MsnSession *session; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
1449 | MsnUser *user; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
1450 | |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
1451 | session = gc->proto_data; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
1452 | user = session->user; |
|
7590
54b26062c7e0
[gaim-migrate @ 8208]
Christian Hammond <chipx86@chipx86.com>
parents:
7563
diff
changeset
|
1453 | |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16437
diff
changeset
|
1454 | msn_user_set_buddy_icon(user, img); |
|
7590
54b26062c7e0
[gaim-migrate @ 8208]
Christian Hammond <chipx86@chipx86.com>
parents:
7563
diff
changeset
|
1455 | |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11920
diff
changeset
|
1456 | msn_change_status(session); |
|
7590
54b26062c7e0
[gaim-migrate @ 8208]
Christian Hammond <chipx86@chipx86.com>
parents:
7563
diff
changeset
|
1457 | } |
|
54b26062c7e0
[gaim-migrate @ 8208]
Christian Hammond <chipx86@chipx86.com>
parents:
7563
diff
changeset
|
1458 | |
|
54b26062c7e0
[gaim-migrate @ 8208]
Christian Hammond <chipx86@chipx86.com>
parents:
7563
diff
changeset
|
1459 | static void |
| 15884 | 1460 | msn_remove_group(PurpleConnection *gc, PurpleGroup *group) |
|
6885
65132ebfc662
[gaim-migrate @ 7431]
Christian Hammond <chipx86@chipx86.com>
parents:
6859
diff
changeset
|
1461 | { |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1462 | MsnSession *session; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1463 | MsnCmdProc *cmdproc; |
| 13856 | 1464 | const char *group_id; |
|
6885
65132ebfc662
[gaim-migrate @ 7431]
Christian Hammond <chipx86@chipx86.com>
parents:
6859
diff
changeset
|
1465 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1466 | session = gc->proto_data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
1467 | cmdproc = session->notification->cmdproc; |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
1468 | |
| 13897 | 1469 | /*we can't delete the default group*/ |
| 1470 | if(!strcmp(group->name,MSN_INDIVIDUALS_GROUP_NAME)|| | |
|
20508
a8855578906a
Revert a bunch of whitespace changes so reviewing a diff against
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20505
diff
changeset
|
1471 | !strcmp(group->name,MSN_NON_IM_GROUP_NAME)) |
|
6885
65132ebfc662
[gaim-migrate @ 7431]
Christian Hammond <chipx86@chipx86.com>
parents:
6859
diff
changeset
|
1472 | { |
| 13897 | 1473 | return ; |
| 1474 | } | |
| 13856 | 1475 | group_id = msn_userlist_find_group_id(session->userlist, group->name); |
|
20508
a8855578906a
Revert a bunch of whitespace changes so reviewing a diff against
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20505
diff
changeset
|
1476 | if (group_id != NULL) |
|
a8855578906a
Revert a bunch of whitespace changes so reviewing a diff against
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20505
diff
changeset
|
1477 | { |
| 13897 | 1478 | msn_del_group(session,group_id); |
|
6885
65132ebfc662
[gaim-migrate @ 7431]
Christian Hammond <chipx86@chipx86.com>
parents:
6859
diff
changeset
|
1479 | } |
|
65132ebfc662
[gaim-migrate @ 7431]
Christian Hammond <chipx86@chipx86.com>
parents:
6859
diff
changeset
|
1480 | } |
|
65132ebfc662
[gaim-migrate @ 7431]
Christian Hammond <chipx86@chipx86.com>
parents:
6859
diff
changeset
|
1481 | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1482 | /** |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1483 | * Extract info text from info_data and add it to user_info |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1484 | */ |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1485 | static gboolean |
| 15884 | 1486 | msn_tooltip_extract_info_text(PurpleNotifyUserInfo *user_info, MsnGetInfoData *info_data) |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1487 | { |
| 15884 | 1488 | PurpleBuddy *b; |
| 9243 | 1489 | |
| 15884 | 1490 | b = purple_find_buddy(purple_connection_get_account(info_data->gc), |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1491 | info_data->name); |
| 9243 | 1492 | |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1493 | if (b) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1494 | { |
|
12970
c2f3b4dcf711
[gaim-migrate @ 15323]
Richard Laager <rlaager@pidgin.im>
parents:
12948
diff
changeset
|
1495 | char *tmp; |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1496 | |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1497 | if (b->alias && b->alias[0]) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1498 | { |
| 9243 | 1499 | char *aliastext = g_markup_escape_text(b->alias, -1); |
| 15884 | 1500 | purple_notify_user_info_add_pair(user_info, _("Alias"), aliastext); |
| 9243 | 1501 | g_free(aliastext); |
| 1502 | } | |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1503 | |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1504 | if (b->server_alias) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1505 | { |
| 9243 | 1506 | char *nicktext = g_markup_escape_text(b->server_alias, -1); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1507 | tmp = g_strdup_printf("<font sml=\"msn\">%s</font><br>", nicktext); |
| 15884 | 1508 | purple_notify_user_info_add_pair(user_info, _("Nickname"), tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1509 | g_free(tmp); |
| 9243 | 1510 | g_free(nicktext); |
| 1511 | } | |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1512 | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1513 | /* Add the tooltip information */ |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1514 | msn_tooltip_text(b, user_info, TRUE); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1515 | |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1516 | return TRUE; |
| 9243 | 1517 | } |
| 1518 | ||
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1519 | return FALSE; |
| 9243 | 1520 | } |
| 1521 | ||
| 1522 | #if PHOTO_SUPPORT | |
| 1523 | ||
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1524 | static char * |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1525 | msn_get_photo_url(const char *url_text) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1526 | { |
|
13391
22e0ab3fb068
[gaim-migrate @ 15763]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13390
diff
changeset
|
1527 | char *p, *q; |
| 9243 | 1528 | |
|
20508
a8855578906a
Revert a bunch of whitespace changes so reviewing a diff against
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20505
diff
changeset
|
1529 | if ((p = strstr(url_text, PHOTO_URL)) != NULL) |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1530 | { |
| 13862 | 1531 | p += strlen(PHOTO_URL); |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1532 | } |
| 13862 | 1533 | if (p && (strncmp(p, "http://",strlen("http://")) == 0) && ((q = strchr(p, '"')) != NULL)) |
|
13391
22e0ab3fb068
[gaim-migrate @ 15763]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13390
diff
changeset
|
1534 | return g_strndup(p, q - p); |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1535 | |
|
13391
22e0ab3fb068
[gaim-migrate @ 15763]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13390
diff
changeset
|
1536 | return NULL; |
| 9243 | 1537 | } |
| 1538 | ||
| 15884 | 1539 | static void msn_got_photo(PurpleUtilFetchUrlData *url_data, gpointer data, |
|
14416
c95ffd983a39
[gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
1540 | const gchar *url_text, size_t len, const gchar *error_message); |
| 9243 | 1541 | |
| 1542 | #endif | |
| 1543 | ||
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1544 | #if 0 |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1545 | static char *msn_info_date_reformat(const char *field, size_t len) |
|
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1546 | { |
|
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1547 | char *tmp = g_strndup(field, len); |
| 15884 | 1548 | time_t t = purple_str_to_time(tmp, FALSE, NULL, NULL, NULL); |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1549 | |
|
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1550 | g_free(tmp); |
| 15884 | 1551 | return g_strdup(purple_date_format_short(localtime(&t))); |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1552 | } |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1553 | #endif |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1554 | |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1555 | #define MSN_GOT_INFO_GET_FIELD(a, b) \ |
| 15884 | 1556 | found = purple_markup_extract_info_field(stripped, stripped_len, user_info, \ |
|
14430
de574ba08dd9
[gaim-migrate @ 17074]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
14416
diff
changeset
|
1557 | "\n" a ":", 0, "\n", 0, "Undisclosed", b, 0, NULL, NULL); \ |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1558 | if (found) \ |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1559 | sect_info = TRUE; |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1560 | |
|
17533
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1561 | #define MSN_GOT_INFO_GET_FIELD_NO_SEARCH(a, b) \ |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1562 | found = purple_markup_extract_info_field(stripped, stripped_len, user_info, \ |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1563 | "\n" a ":", 0, "\n", 0, "Undisclosed", b, 0, NULL, msn_info_strip_search_link); \ |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1564 | if (found) \ |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1565 | sect_info = TRUE; |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1566 | |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1567 | static char * |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1568 | msn_info_strip_search_link(const char *field, size_t len) |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1569 | { |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1570 | const char *c; |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1571 | if ((c = strstr(field, " (http://spaces.live.com/default.aspx?page=searchresults")) == NULL && |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1572 | (c = strstr(field, " (http://spaces.msn.com/default.aspx?page=searchresults")) == NULL) |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1573 | return g_strndup(field, len); |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1574 | return g_strndup(field, c - field); |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1575 | } |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1576 | |
|
6885
65132ebfc662
[gaim-migrate @ 7431]
Christian Hammond <chipx86@chipx86.com>
parents:
6859
diff
changeset
|
1577 | static void |
| 15884 | 1578 | msn_got_info(PurpleUtilFetchUrlData *url_data, gpointer data, |
|
14416
c95ffd983a39
[gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
1579 | const gchar *url_text, size_t len, const gchar *error_message) |
| 6516 | 1580 | { |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1581 | MsnGetInfoData *info_data = (MsnGetInfoData *)data; |
| 15884 | 1582 | PurpleNotifyUserInfo *user_info; |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1583 | char *stripped, *p, *q, *tmp; |
| 6516 | 1584 | char *user_url = NULL; |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1585 | gboolean found; |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1586 | gboolean has_tooltip_text = FALSE; |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1587 | gboolean has_info = FALSE; |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1588 | gboolean sect_info = FALSE; |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1589 | gboolean has_contact_info = FALSE; |
|
7094
8f9588491993
[gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents:
7062
diff
changeset
|
1590 | char *url_buffer; |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1591 | GString *s, *s2; |
| 7675 | 1592 | int stripped_len; |
| 9243 | 1593 | #if PHOTO_SUPPORT |
| 1594 | char *photo_url_text = NULL; | |
| 1595 | MsnGetInfoStepTwoData *info2_data = NULL; | |
| 1596 | #endif | |
| 6516 | 1597 | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
1598 | purple_debug_info("msn", "In msn_got_info,url_text:{%s}\n",url_text); |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1599 | |
|
13480
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
1600 | /* Make sure the connection is still valid */ |
|
18122
9bf9970c1b6a
disapproval of revision '2d8ea56b90971e7851442d96b7d74ecb4f052126'
Richard Laager <rlaager@pidgin.im>
parents:
18121
diff
changeset
|
1601 | if (g_list_find(purple_connections_get_all(), info_data->gc) == NULL) |
|
13480
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
1602 | { |
| 15884 | 1603 | purple_debug_warning("msn", "invalid connection. ignoring buddy info.\n"); |
|
13480
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
1604 | g_free(info_data->name); |
|
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
1605 | g_free(info_data); |
|
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
1606 | return; |
|
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
1607 | } |
|
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
1608 | |
| 15884 | 1609 | user_info = purple_notify_user_info_new(); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1610 | has_tooltip_text = msn_tooltip_extract_info_text(user_info, info_data); |
| 9243 | 1611 | |
|
14416
c95ffd983a39
[gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
1612 | if (error_message != NULL || url_text == NULL || strcmp(url_text, "") == 0) |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1613 | { |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1614 | tmp = g_strdup_printf("<b>%s</b>", _("Error retrieving profile")); |
| 15884 | 1615 | purple_notify_user_info_add_pair(user_info, NULL, tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1616 | g_free(tmp); |
| 9243 | 1617 | |
| 15884 | 1618 | purple_notify_userinfo(info_data->gc, info_data->name, user_info, NULL, NULL); |
| 1619 | purple_notify_user_info_destroy(user_info); | |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1620 | |
|
14430
de574ba08dd9
[gaim-migrate @ 17074]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
14416
diff
changeset
|
1621 | g_free(info_data->name); |
|
de574ba08dd9
[gaim-migrate @ 17074]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
14416
diff
changeset
|
1622 | g_free(info_data); |
| 6516 | 1623 | return; |
| 1624 | } | |
| 1625 | ||
|
7094
8f9588491993
[gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents:
7062
diff
changeset
|
1626 | url_buffer = g_strdup(url_text); |
|
8f9588491993
[gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents:
7062
diff
changeset
|
1627 | |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1628 | /* If they have a homepage link, MSN masks it such that we need to |
| 15884 | 1629 | * fetch the url out before purple_markup_strip_html() nukes it */ |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1630 | /* I don't think this works with the new spaces profiles - Stu 3/2/06 */ |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1631 | if ((p = strstr(url_text, |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1632 | "Take a look at my </font><A class=viewDesc title=\"")) != NULL) |
| 6516 | 1633 | { |
| 1634 | p += 50; | |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1635 | |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1636 | if ((q = strchr(p, '"')) != NULL) |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1637 | user_url = g_strndup(p, q - p); |
| 6516 | 1638 | } |
| 1639 | ||
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1640 | /* |
| 15884 | 1641 | * purple_markup_strip_html() doesn't strip out character entities like |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1642 | * and · |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1643 | */ |
|
7094
8f9588491993
[gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents:
7062
diff
changeset
|
1644 | while ((p = strstr(url_buffer, " ")) != NULL) |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1645 | { |
| 9243 | 1646 | *p = ' '; /* Turn 's into ordinary blanks */ |
| 1647 | p += 1; | |
| 1648 | memmove(p, p + 5, strlen(p + 5)); | |
| 1649 | url_buffer[strlen(url_buffer) - 5] = '\0'; | |
| 6516 | 1650 | } |
| 1651 | ||
|
7094
8f9588491993
[gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents:
7062
diff
changeset
|
1652 | while ((p = strstr(url_buffer, "·")) != NULL) |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1653 | { |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1654 | memmove(p, p + 6, strlen(p + 6)); |
|
7094
8f9588491993
[gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents:
7062
diff
changeset
|
1655 | url_buffer[strlen(url_buffer) - 6] = '\0'; |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1656 | } |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1657 | |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1658 | /* Nuke the nasty \r's that just get in the way */ |
| 15884 | 1659 | purple_str_strip_char(url_buffer, '\r'); |
| 6516 | 1660 | |
|
8735
01248ea222d3
[gaim-migrate @ 9490]
Jonathan Champ <royanee@users.sourceforge.net>
parents:
8713
diff
changeset
|
1661 | /* MSN always puts in ' for apostrophes...replace them */ |
|
7094
8f9588491993
[gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents:
7062
diff
changeset
|
1662 | while ((p = strstr(url_buffer, "'")) != NULL) |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1663 | { |
| 6516 | 1664 | *p = '\''; |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1665 | memmove(p + 1, p + 5, strlen(p + 5)); |
|
7094
8f9588491993
[gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents:
7062
diff
changeset
|
1666 | url_buffer[strlen(url_buffer) - 4] = '\0'; |
| 6516 | 1667 | } |
| 1668 | ||
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1669 | /* Nuke the html, it's easier than trying to parse the horrid stuff */ |
| 15884 | 1670 | stripped = purple_markup_strip_html(url_buffer); |
| 7675 | 1671 | stripped_len = strlen(stripped); |
| 6516 | 1672 | |
| 15884 | 1673 | purple_debug_misc("msn", "stripped = %p\n", stripped); |
| 1674 | purple_debug_misc("msn", "url_buffer = %p\n", url_buffer); | |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1675 | |
|
7094
8f9588491993
[gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents:
7062
diff
changeset
|
1676 | /* Gonna re-use the memory we've already got for url_buffer */ |
| 7675 | 1677 | /* No we're not. */ |
| 1678 | s = g_string_sized_new(strlen(url_buffer)); | |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1679 | s2 = g_string_sized_new(strlen(url_buffer)); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1680 | |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1681 | /* General section header */ |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1682 | if (has_tooltip_text) |
| 15884 | 1683 | purple_notify_user_info_add_section_break(user_info); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1684 | |
| 15884 | 1685 | purple_notify_user_info_add_section_header(user_info, _("General")); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1686 | |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1687 | /* Extract their Name and put it in */ |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1688 | MSN_GOT_INFO_GET_FIELD("Name", _("Name")); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1689 | |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1690 | /* General */ |
|
13545
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1691 | MSN_GOT_INFO_GET_FIELD("Nickname", _("Nickname")); |
|
17533
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1692 | MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Age", _("Age")); |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1693 | MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Gender", _("Gender")); |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1694 | MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Occupation", _("Occupation")); |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1695 | MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Location", _("Location")); |
| 6516 | 1696 | |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1697 | /* Extract their Interests and put it in */ |
| 15884 | 1698 | found = purple_markup_extract_info_field(stripped, stripped_len, user_info, |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1699 | "\nInterests\t", 0, " (/default.aspx?page=searchresults", 0, |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1700 | "Undisclosed", _("Hobbies and Interests") /* _("Interests") */, |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1701 | 0, NULL, NULL); |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1702 | |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1703 | if (found) |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1704 | sect_info = TRUE; |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1705 | |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1706 | MSN_GOT_INFO_GET_FIELD("More about me", _("A Little About Me")); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1707 | |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1708 | if (sect_info) |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1709 | { |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1710 | has_info = TRUE; |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1711 | sect_info = FALSE; |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1712 | } |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1713 | else |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1714 | { |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1715 | /* Remove the section header */ |
| 15884 | 1716 | purple_notify_user_info_remove_last_item(user_info); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1717 | if (has_tooltip_text) |
| 15884 | 1718 | purple_notify_user_info_remove_last_item(user_info); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1719 | } |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1720 | |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1721 | /* Social */ |
| 15884 | 1722 | purple_notify_user_info_add_section_break(user_info); |
| 1723 | purple_notify_user_info_add_section_header(user_info, _("Social")); | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1724 | |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1725 | MSN_GOT_INFO_GET_FIELD("Marital status", _("Marital Status")); |
|
13545
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1726 | MSN_GOT_INFO_GET_FIELD("Interested in", _("Interests")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1727 | MSN_GOT_INFO_GET_FIELD("Pets", _("Pets")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1728 | MSN_GOT_INFO_GET_FIELD("Hometown", _("Hometown")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1729 | MSN_GOT_INFO_GET_FIELD("Places lived", _("Places Lived")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1730 | MSN_GOT_INFO_GET_FIELD("Fashion", _("Fashion")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1731 | MSN_GOT_INFO_GET_FIELD("Humor", _("Humor")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1732 | MSN_GOT_INFO_GET_FIELD("Music", _("Music")); |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1733 | MSN_GOT_INFO_GET_FIELD("Favorite quote", _("Favorite Quote")); |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1734 | |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1735 | if (sect_info) |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1736 | { |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1737 | has_info = TRUE; |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1738 | sect_info = FALSE; |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1739 | } |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1740 | else |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1741 | { |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1742 | /* Remove the section header */ |
| 15884 | 1743 | purple_notify_user_info_remove_last_item(user_info); |
| 1744 | purple_notify_user_info_remove_last_item(user_info); | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1745 | } |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1746 | |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1747 | /* Contact Info */ |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1748 | /* Personal */ |
| 15884 | 1749 | purple_notify_user_info_add_section_break(user_info); |
| 1750 | purple_notify_user_info_add_section_header(user_info, _("Contact Info")); | |
| 1751 | purple_notify_user_info_add_section_header(user_info, _("Personal")); | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1752 | |
|
13545
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1753 | MSN_GOT_INFO_GET_FIELD("Name", _("Name")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1754 | MSN_GOT_INFO_GET_FIELD("Significant other", _("Significant Other")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1755 | MSN_GOT_INFO_GET_FIELD("Home phone", _("Home Phone")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1756 | MSN_GOT_INFO_GET_FIELD("Home phone 2", _("Home Phone 2")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1757 | MSN_GOT_INFO_GET_FIELD("Home address", _("Home Address")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1758 | MSN_GOT_INFO_GET_FIELD("Personal Mobile", _("Personal Mobile")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1759 | MSN_GOT_INFO_GET_FIELD("Home fax", _("Home Fax")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1760 | MSN_GOT_INFO_GET_FIELD("Personal e-mail", _("Personal E-Mail")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1761 | MSN_GOT_INFO_GET_FIELD("Personal IM", _("Personal IM")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1762 | MSN_GOT_INFO_GET_FIELD("Birthday", _("Birthday")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1763 | MSN_GOT_INFO_GET_FIELD("Anniversary", _("Anniversary")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1764 | MSN_GOT_INFO_GET_FIELD("Notes", _("Notes")); |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1765 | |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1766 | if (sect_info) |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1767 | { |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1768 | has_info = TRUE; |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1769 | sect_info = FALSE; |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1770 | has_contact_info = TRUE; |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1771 | } |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1772 | else |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1773 | { |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1774 | /* Remove the section header */ |
| 15884 | 1775 | purple_notify_user_info_remove_last_item(user_info); |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1776 | } |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1777 | |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1778 | /* Business */ |
| 15884 | 1779 | purple_notify_user_info_add_section_header(user_info, _("Work")); |
|
13545
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1780 | MSN_GOT_INFO_GET_FIELD("Name", _("Name")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1781 | MSN_GOT_INFO_GET_FIELD("Job title", _("Job Title")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1782 | MSN_GOT_INFO_GET_FIELD("Company", _("Company")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1783 | MSN_GOT_INFO_GET_FIELD("Department", _("Department")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1784 | MSN_GOT_INFO_GET_FIELD("Profession", _("Profession")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1785 | MSN_GOT_INFO_GET_FIELD("Work phone 1", _("Work Phone")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1786 | MSN_GOT_INFO_GET_FIELD("Work phone 2", _("Work Phone 2")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1787 | MSN_GOT_INFO_GET_FIELD("Work address", _("Work Address")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1788 | MSN_GOT_INFO_GET_FIELD("Work mobile", _("Work Mobile")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1789 | MSN_GOT_INFO_GET_FIELD("Work pager", _("Work Pager")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1790 | MSN_GOT_INFO_GET_FIELD("Work fax", _("Work Fax")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1791 | MSN_GOT_INFO_GET_FIELD("Work e-mail", _("Work E-Mail")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1792 | MSN_GOT_INFO_GET_FIELD("Work IM", _("Work IM")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1793 | MSN_GOT_INFO_GET_FIELD("Start date", _("Start Date")); |
|
4647ec0d8a83
[gaim-migrate @ 15921]
Richard Laager <rlaager@pidgin.im>
parents:
13482
diff
changeset
|
1794 | MSN_GOT_INFO_GET_FIELD("Notes", _("Notes")); |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1795 | |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1796 | if (sect_info) |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1797 | { |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1798 | has_info = TRUE; |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1799 | sect_info = FALSE; |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1800 | has_contact_info = TRUE; |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1801 | } |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1802 | else |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1803 | { |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1804 | /* Remove the section header */ |
| 15884 | 1805 | purple_notify_user_info_remove_last_item(user_info); |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1806 | } |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1807 | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1808 | if (!has_contact_info) |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1809 | { |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1810 | /* Remove the Contact Info section header */ |
| 15884 | 1811 | purple_notify_user_info_remove_last_item(user_info); |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1812 | } |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1813 | |
|
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1814 | #if 0 /* these probably don't show up any more */ |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1815 | /* |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1816 | * The fields, 'A Little About Me', 'Favorite Things', 'Hobbies |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1817 | * and Interests', 'Favorite Quote', and 'My Homepage' may or may |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1818 | * not appear, in any combination. However, they do appear in |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1819 | * certain order, so we can successively search to pin down the |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1820 | * distinct values. |
| 6516 | 1821 | */ |
| 1822 | ||
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1823 | /* Check if they have A Little About Me */ |
| 15884 | 1824 | found = purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1825 | " A Little About Me \n\n", 0, "Favorite Things", '\n', NULL, |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1826 | _("A Little About Me"), 0, NULL, NULL); |
| 6516 | 1827 | |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1828 | if (!found) |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1829 | { |
| 15884 | 1830 | found = purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1831 | " A Little About Me \n\n", 0, "Hobbies and Interests", '\n', |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1832 | NULL, _("A Little About Me"), 0, NULL, NULL); |
|
7095
17d2b54254f8
[gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents:
7094
diff
changeset
|
1833 | } |
|
17d2b54254f8
[gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents:
7094
diff
changeset
|
1834 | |
|
17d2b54254f8
[gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents:
7094
diff
changeset
|
1835 | if (!found) |
|
17d2b54254f8
[gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents:
7094
diff
changeset
|
1836 | { |
| 15884 | 1837 | found = purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1838 | " A Little About Me \n\n", 0, "Favorite Quote", '\n', NULL, |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1839 | _("A Little About Me"), 0, NULL, NULL); |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1840 | } |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1841 | |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1842 | if (!found) |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1843 | { |
| 15884 | 1844 | found = purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1845 | " A Little About Me \n\n", 0, "My Homepage \n\nTake a look", |
| 1846 | '\n', | |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1847 | NULL, _("A Little About Me"), 0, NULL, NULL); |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1848 | } |
| 6516 | 1849 | |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1850 | if (!found) |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1851 | { |
| 15884 | 1852 | purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1853 | " A Little About Me \n\n", 0, "last updated", '\n', NULL, |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1854 | _("A Little About Me"), 0, NULL, NULL); |
|
7095
17d2b54254f8
[gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents:
7094
diff
changeset
|
1855 | } |
|
17d2b54254f8
[gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents:
7094
diff
changeset
|
1856 | |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1857 | if (found) |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1858 | has_info = TRUE; |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1859 | |
|
7095
17d2b54254f8
[gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents:
7094
diff
changeset
|
1860 | /* Check if they have Favorite Things */ |
| 15884 | 1861 | found = purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1862 | " Favorite Things \n\n", 0, "Hobbies and Interests", '\n', NULL, |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1863 | _("Favorite Things"), 0, NULL, NULL); |
|
7095
17d2b54254f8
[gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents:
7094
diff
changeset
|
1864 | |
|
17d2b54254f8
[gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents:
7094
diff
changeset
|
1865 | if (!found) |
|
17d2b54254f8
[gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents:
7094
diff
changeset
|
1866 | { |
| 15884 | 1867 | found = purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1868 | " Favorite Things \n\n", 0, "Favorite Quote", '\n', NULL, |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1869 | _("Favorite Things"), 0, NULL, NULL); |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1870 | } |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1871 | |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1872 | if (!found) |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1873 | { |
| 15884 | 1874 | found = purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1875 | " Favorite Things \n\n", 0, "My Homepage \n\nTake a look", '\n', |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1876 | NULL, _("Favorite Things"), 0, NULL, NULL); |
| 6516 | 1877 | } |
| 1878 | ||
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1879 | if (!found) |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1880 | { |
| 15884 | 1881 | purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1882 | " Favorite Things \n\n", 0, "last updated", '\n', NULL, |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1883 | _("Favorite Things"), 0, NULL, NULL); |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1884 | } |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1885 | |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1886 | if (found) |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1887 | has_info = TRUE; |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1888 | |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1889 | /* Check if they have Hobbies and Interests */ |
| 15884 | 1890 | found = purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1891 | " Hobbies and Interests \n\n", 0, "Favorite Quote", '\n', NULL, |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1892 | _("Hobbies and Interests"), 0, NULL, NULL); |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1893 | |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1894 | if (!found) |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1895 | { |
| 15884 | 1896 | found = purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1897 | " Hobbies and Interests \n\n", 0, "My Homepage \n\nTake a look", |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1898 | '\n', NULL, _("Hobbies and Interests"), 0, NULL, NULL); |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1899 | } |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1900 | |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1901 | if (!found) |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1902 | { |
| 15884 | 1903 | purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1904 | " Hobbies and Interests \n\n", 0, "last updated", '\n', NULL, |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1905 | _("Hobbies and Interests"), 0, NULL, NULL); |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1906 | } |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1907 | |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1908 | if (found) |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1909 | has_info = TRUE; |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1910 | |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1911 | /* Check if they have Favorite Quote */ |
| 15884 | 1912 | found = purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1913 | "Favorite Quote \n\n", 0, "My Homepage \n\nTake a look", '\n', NULL, |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1914 | _("Favorite Quote"), 0, NULL, NULL); |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1915 | |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1916 | if (!found) |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1917 | { |
| 15884 | 1918 | purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1919 | "Favorite Quote \n\n", 0, "last updated", '\n', NULL, |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1920 | _("Favorite Quote"), 0, NULL, NULL); |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1921 | } |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1922 | |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1923 | if (found) |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1924 | has_info = TRUE; |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1925 | |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1926 | /* Extract the last updated date and put it in */ |
| 15884 | 1927 | found = purple_markup_extract_info_field(stripped, stripped_len, s, |
| 9243 | 1928 | " last updated:", 1, "\n", 0, NULL, _("Last Updated"), 0, |
|
13105
8f9c66e4af87
[gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents:
13020
diff
changeset
|
1929 | NULL, msn_info_date_reformat); |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1930 | |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1931 | if (found) |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1932 | has_info = TRUE; |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1933 | #endif |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1934 | |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1935 | /* If we were able to fetch a homepage url earlier, stick it in there */ |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1936 | if (user_url != NULL) |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1937 | { |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1938 | tmp = g_strdup_printf("<a href=\"%s\">%s</a>", user_url, user_url); |
| 15884 | 1939 | purple_notify_user_info_add_pair(user_info, _("Homepage"), tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1940 | g_free(tmp); |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1941 | g_free(user_url); |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1942 | |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
1943 | has_info = TRUE; |
|
6859
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1944 | } |
|
070c664d7c14
[gaim-migrate @ 7404]
Christian Hammond <chipx86@chipx86.com>
parents:
6858
diff
changeset
|
1945 | |
| 9510 | 1946 | if (!has_info) |
| 1947 | { | |
| 1948 | /* MSN doesn't actually distinguish between "unknown member" and | |
| 1949 | * a known member with an empty profile. Try to explain this fact. | |
| 1950 | * Note that if we have a nonempty tooltip_text, we know the user | |
| 1951 | * exists. | |
| 1952 | */ | |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1953 | /* This doesn't work with the new spaces profiles - Stu 3/2/06 |
| 9510 | 1954 | char *p = strstr(url_buffer, "Unknown Member </TITLE>"); |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1955 | * This might not work for long either ... */ |
|
17533
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1956 | /* Nope, it failed some time before 5/2/07 :( |
|
13390
1d9b81d3a9b0
[gaim-migrate @ 15762]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
13297
diff
changeset
|
1957 | char *p = strstr(url_buffer, "form id=\"SpacesSearch\" name=\"SpacesSearch\""); |
|
17533
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1958 | * Let's see how long this one holds out for ... */ |
|
1968afe33448
Improve parsing user info for MSN, Fixes #690
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17290
diff
changeset
|
1959 | char *p = strstr(url_buffer, "<form id=\"profile_form\" name=\"profile_form\" action=\"http://spaces.live.com/profile.aspx?cid=0\""); |
| 15884 | 1960 | PurpleBuddy *b = purple_find_buddy |
| 1961 | (purple_connection_get_account(info_data->gc), info_data->name); | |
| 1962 | purple_notify_user_info_add_pair(user_info, _("Error retrieving profile"), | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1963 | ((p && b) ? _("The user has not created a public profile.") : |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1964 | (p ? _("MSN reported not being able to find the user's profile. " |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1965 | "This either means that the user does not exist, " |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1966 | "or that the user exists " |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1967 | "but has not created a public profile.") : |
|
15444
b793ef258d23
I think this changes every user-visible string that contains 'Gaim.' We probably want the UI to be able
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
1968 | _("Could not find " /* This should never happen */ |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1969 | "any information in the user's profile. " |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1970 | "The user most likely does not exist.")))); |
| 9243 | 1971 | } |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1972 | |
| 9510 | 1973 | /* put a link to the actual profile URL */ |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1974 | tmp = g_strdup_printf("<a href=\"%s%s\">%s%s</a>", |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1975 | PROFILE_URL, info_data->name, PROFILE_URL, info_data->name); |
| 15884 | 1976 | purple_notify_user_info_add_pair(user_info, _("Profile URL"), tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1977 | g_free(tmp); |
|
7062
26abb8b189ce
[gaim-migrate @ 7626]
Christian Hammond <chipx86@chipx86.com>
parents:
7015
diff
changeset
|
1978 | |
| 9243 | 1979 | #if PHOTO_SUPPORT |
| 9569 | 1980 | /* Find the URL to the photo; must be before the marshalling [Bug 994207] */ |
| 1981 | photo_url_text = msn_get_photo_url(url_text); | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
1982 | purple_debug_info("Ma Yuan","photo url:{%s}\n",photo_url_text); |
| 9243 | 1983 | |
| 1984 | /* Marshall the existing state */ | |
| 1985 | info2_data = g_malloc0(sizeof(MsnGetInfoStepTwoData)); | |
| 1986 | info2_data->info_data = info_data; | |
| 1987 | info2_data->stripped = stripped; | |
| 1988 | info2_data->url_buffer = url_buffer; | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
1989 | info2_data->user_info = user_info; |
| 9243 | 1990 | info2_data->photo_url_text = photo_url_text; |
| 1991 | ||
| 1992 | /* Try to put the photo in there too, if there's one */ | |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1993 | if (photo_url_text) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1994 | { |
| 15884 | 1995 | purple_util_fetch_url(photo_url_text, FALSE, NULL, FALSE, msn_got_photo, |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1996 | info2_data); |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1997 | } |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1998 | else |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
1999 | { |
| 9243 | 2000 | /* Emulate a callback */ |
|
14416
c95ffd983a39
[gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
2001 | /* TODO: Huh? */ |
|
c95ffd983a39
[gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
2002 | msn_got_photo(NULL, info2_data, NULL, 0, NULL); |
| 9243 | 2003 | } |
| 2004 | } | |
| 2005 | ||
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
2006 | static void |
| 15884 | 2007 | msn_got_photo(PurpleUtilFetchUrlData *url_data, gpointer user_data, |
|
14416
c95ffd983a39
[gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
2008 | const gchar *url_text, size_t len, const gchar *error_message) |
| 9243 | 2009 | { |
|
14416
c95ffd983a39
[gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
2010 | MsnGetInfoStepTwoData *info2_data = (MsnGetInfoStepTwoData *)user_data; |
| 9243 | 2011 | int id = -1; |
| 2012 | ||
| 2013 | /* Unmarshall the saved state */ | |
| 2014 | MsnGetInfoData *info_data = info2_data->info_data; | |
| 2015 | char *stripped = info2_data->stripped; | |
| 2016 | char *url_buffer = info2_data->url_buffer; | |
| 15884 | 2017 | PurpleNotifyUserInfo *user_info = info2_data->user_info; |
| 9243 | 2018 | char *photo_url_text = info2_data->photo_url_text; |
| 2019 | ||
|
13480
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
2020 | /* Make sure the connection is still valid if we got here by fetching a photo url */ |
|
14570
a3f5c8a5ebc9
[gaim-migrate @ 17228]
Evan Schoenberg <evands@pidgin.im>
parents:
14430
diff
changeset
|
2021 | if (url_text && (error_message != NULL || |
|
18122
9bf9970c1b6a
disapproval of revision '2d8ea56b90971e7851442d96b7d74ecb4f052126'
Richard Laager <rlaager@pidgin.im>
parents:
18121
diff
changeset
|
2022 | g_list_find(purple_connections_get_all(), info_data->gc) == NULL)) |
|
13480
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
2023 | { |
| 15884 | 2024 | purple_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n"); |
|
13480
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
2025 | g_free(stripped); |
|
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
2026 | g_free(url_buffer); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15192
diff
changeset
|
2027 | g_free(user_info); |
|
13480
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
2028 | g_free(info_data->name); |
|
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
2029 | g_free(info_data); |
|
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
2030 | g_free(photo_url_text); |
|
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
2031 | g_free(info2_data); |
|
13482
8b1b470cc1ef
[gaim-migrate @ 15857]
Evan Schoenberg <evands@pidgin.im>
parents:
13480
diff
changeset
|
2032 | |
|
13480
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
2033 | return; |
|
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
2034 | } |
|
fa44dafa1a02
[gaim-migrate @ 15855]
Evan Schoenberg <evands@pidgin.im>
parents:
13391
diff
changeset
|
2035 | |
| 9243 | 2036 | /* Try to put the photo in there too, if there's one and is readable */ |
|
14416
c95ffd983a39
[gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
2037 | if (user_data && url_text && len != 0) |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
2038 | { |
| 9243 | 2039 | if (strstr(url_text, "400 Bad Request") |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
2040 | || strstr(url_text, "403 Forbidden") |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
2041 | || strstr(url_text, "404 Not Found")) |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
2042 | { |
| 9243 | 2043 | |
| 15884 | 2044 | purple_debug_info("msn", "Error getting %s: %s\n", |
| 9243 | 2045 | photo_url_text, url_text); |
|
10044
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
2046 | } |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
2047 | else |
|
884c09b189e6
[gaim-migrate @ 11003]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9967
diff
changeset
|
2048 | { |
| 9243 | 2049 | char buf[1024]; |
| 15884 | 2050 | purple_debug_info("msn", "%s is %d bytes\n", photo_url_text, len); |
|
16539
75a20ae3a527
Change the imgstore and by extension, then the buddy icon code to take over
Richard Laager <rlaager@pidgin.im>
parents:
16538
diff
changeset
|
2051 | id = purple_imgstore_add_with_id(g_memdup(url_text, len), len, NULL); |
| 9243 | 2052 | g_snprintf(buf, sizeof(buf), "<img id=\"%d\"><br>", id); |
| 15884 | 2053 | purple_notify_user_info_prepend_pair(user_info, NULL, buf); |
| 9243 | 2054 | } |
| 2055 | } | |
| 2056 | ||
| 2057 | /* We continue here from msn_got_info, as if nothing has happened */ | |
| 2058 | #endif | |
| 15884 | 2059 | purple_notify_userinfo(info_data->gc, info_data->name, user_info, NULL, NULL); |
|
7062
26abb8b189ce
[gaim-migrate @ 7626]
Christian Hammond <chipx86@chipx86.com>
parents:
7015
diff
changeset
|
2060 | |
| 6516 | 2061 | g_free(stripped); |
|
7094
8f9588491993
[gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents:
7062
diff
changeset
|
2062 | g_free(url_buffer); |
| 15884 | 2063 | purple_notify_user_info_destroy(user_info); |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
2064 | g_free(info_data->name); |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
2065 | g_free(info_data); |
| 9243 | 2066 | #if PHOTO_SUPPORT |
| 2067 | g_free(photo_url_text); | |
| 2068 | g_free(info2_data); | |
| 2069 | if (id != -1) | |
|
16437
7ff7c3405ea2
Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
2070 | purple_imgstore_unref_by_id(id); |
| 9243 | 2071 | #endif |
| 6516 | 2072 | } |
| 2073 | ||
| 2074 | static void | |
| 15884 | 2075 | msn_get_info(PurpleConnection *gc, const char *name) |
| 6516 | 2076 | { |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
2077 | MsnGetInfoData *data; |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
2078 | char *url; |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
2079 | |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
2080 | data = g_new0(MsnGetInfoData, 1); |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
2081 | data->gc = gc; |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
2082 | data->name = g_strdup(name); |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
2083 | |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
2084 | url = g_strdup_printf("%s%s", PROFILE_URL, name); |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
2085 | |
| 15884 | 2086 | purple_util_fetch_url(url, FALSE, |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
2087 | "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)", |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
2088 | TRUE, msn_got_info, data); |
|
7104
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
2089 | |
|
d8415ef3d687
[gaim-migrate @ 7669]
Christian Hammond <chipx86@chipx86.com>
parents:
7095
diff
changeset
|
2090 | g_free(url); |
| 6516 | 2091 | } |
| 2092 | ||
| 15884 | 2093 | static gboolean msn_load(PurplePlugin *plugin) |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2094 | { |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2095 | msn_notification_init(); |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2096 | msn_switchboard_init(); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
2097 | msn_sync_init(); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2098 | |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2099 | return TRUE; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2100 | } |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2101 | |
| 15884 | 2102 | static gboolean msn_unload(PurplePlugin *plugin) |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2103 | { |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2104 | msn_notification_end(); |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2105 | msn_switchboard_end(); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
2106 | msn_sync_end(); |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2107 | |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2108 | return TRUE; |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2109 | } |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2110 | |
| 15884 | 2111 | static PurpleAccount *find_acct(const char *prpl, const char *acct_id) |
|
15685
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2112 | { |
| 15884 | 2113 | PurpleAccount *acct = NULL; |
|
15685
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2114 | |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2115 | /* If we have a specific acct, use it */ |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2116 | if (acct_id) { |
| 15884 | 2117 | acct = purple_accounts_find(acct_id, prpl); |
| 2118 | if (acct && !purple_account_is_connected(acct)) | |
|
15685
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2119 | acct = NULL; |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2120 | } else { /* Otherwise find an active account for the protocol */ |
|
18122
9bf9970c1b6a
disapproval of revision '2d8ea56b90971e7851442d96b7d74ecb4f052126'
Richard Laager <rlaager@pidgin.im>
parents:
18121
diff
changeset
|
2121 | GList *l = purple_accounts_get_all(); |
|
15685
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2122 | while (l) { |
| 15884 | 2123 | if (!strcmp(prpl, purple_account_get_protocol_id(l->data)) |
| 2124 | && purple_account_is_connected(l->data)) { | |
|
15685
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2125 | acct = l->data; |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2126 | break; |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2127 | } |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2128 | l = l->next; |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2129 | } |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2130 | } |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2131 | |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2132 | return acct; |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2133 | } |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2134 | |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2135 | static gboolean msn_uri_handler(const char *proto, const char *cmd, GHashTable *params) |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2136 | { |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2137 | char *acct_id = g_hash_table_lookup(params, "account"); |
| 15884 | 2138 | PurpleAccount *acct; |
|
15685
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2139 | |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2140 | if (g_ascii_strcasecmp(proto, "msnim")) |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2141 | return FALSE; |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2142 | |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2143 | acct = find_acct("prpl-msn", acct_id); |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2144 | |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2145 | if (!acct) |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2146 | return FALSE; |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2147 | |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2148 | /* msnim:chat?contact=user@domain.tld */ |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2149 | if (!g_ascii_strcasecmp(cmd, "Chat")) { |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2150 | char *sname = g_hash_table_lookup(params, "contact"); |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2151 | if (sname) { |
| 15884 | 2152 | PurpleConversation *conv = purple_find_conversation_with_account( |
| 2153 | PURPLE_CONV_TYPE_IM, sname, acct); | |
|
15685
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2154 | if (conv == NULL) |
| 15884 | 2155 | conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, sname); |
| 2156 | purple_conversation_present(conv); | |
|
15685
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2157 | } |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2158 | /*else |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2159 | **If pidgindialogs_im() was in the core, we could use it here. |
| 15884 | 2160 | * It is all purple_request_* based, but I'm not sure it really belongs in the core |
|
15685
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2161 | pidgindialogs_im();*/ |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2162 | |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2163 | return TRUE; |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2164 | } |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2165 | /* msnim:add?contact=user@domain.tld */ |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2166 | else if (!g_ascii_strcasecmp(cmd, "Add")) { |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2167 | char *name = g_hash_table_lookup(params, "contact"); |
| 15884 | 2168 | purple_blist_request_add_buddy(acct, name, NULL, NULL); |
|
15685
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2169 | return TRUE; |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2170 | } |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2171 | |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2172 | return FALSE; |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2173 | } |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2174 | |
|
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2175 | |
| 15884 | 2176 | static PurplePluginProtocolInfo prpl_info = |
|
5205
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2177 | { |
| 9308 | 2178 | OPT_PROTO_MAIL_CHECK, |
|
9475
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2179 | NULL, /* user_splits */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2180 | NULL, /* protocol_options */ |
| 15884 | 2181 | {"png", 0, 0, 96, 96, 0, PURPLE_ICON_SCALE_SEND}, /* icon_spec */ |
|
9475
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2182 | msn_list_icon, /* list_icon */ |
|
15602
6d1d20a9e297
This is my attempt at MSN mobile status, but I suspect MSN mobile status doesn't exist. If it's confirmed that it doesn't, I'll revert this. But I want to keep it for posterity, in case it does exist
Sean Egan <seanegan@pidgin.im>
parents:
15524
diff
changeset
|
2183 | NULL, /* list_emblems */ |
|
9475
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2184 | msn_status_text, /* status_text */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2185 | msn_tooltip_text, /* tooltip_text */ |
| 9951 | 2186 | msn_status_types, /* away_states */ |
| 2187 | msn_blist_node_menu, /* blist_node_menu */ | |
|
9475
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2188 | NULL, /* chat_info */ |
|
9754
3a17eee239b2
[gaim-migrate @ 10621]
Nathan Fredrickson <nathan@silverorange.com>
parents:
9713
diff
changeset
|
2189 | NULL, /* chat_info_defaults */ |
| 9951 | 2190 | msn_login, /* login */ |
| 2191 | msn_close, /* close */ | |
|
9475
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2192 | msn_send_im, /* send_im */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2193 | NULL, /* set_info */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2194 | msn_send_typing, /* send_typing */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2195 | msn_get_info, /* get_info */ |
|
9967
7400b348ff62
[gaim-migrate @ 10877]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9953
diff
changeset
|
2196 | msn_set_status, /* set_away */ |
|
9475
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2197 | msn_set_idle, /* set_idle */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2198 | NULL, /* change_passwd */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2199 | msn_add_buddy, /* add_buddy */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2200 | NULL, /* add_buddies */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2201 | msn_rem_buddy, /* remove_buddy */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2202 | NULL, /* remove_buddies */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2203 | msn_add_permit, /* add_permit */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2204 | msn_add_deny, /* add_deny */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2205 | msn_rem_permit, /* rem_permit */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2206 | msn_rem_deny, /* rem_deny */ |
| 13856 | 2207 | msn_set_permit_deny, /* set_permit_deny */ |
|
9475
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2208 | NULL, /* join_chat */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2209 | NULL, /* reject chat invite */ |
|
10463
f2f97738b401
[gaim-migrate @ 11737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10451
diff
changeset
|
2210 | NULL, /* get_chat_name */ |
|
9475
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2211 | msn_chat_invite, /* chat_invite */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2212 | msn_chat_leave, /* chat_leave */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2213 | NULL, /* chat_whisper */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2214 | msn_chat_send, /* chat_send */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2215 | msn_keepalive, /* keepalive */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2216 | NULL, /* register_user */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2217 | NULL, /* get_cb_info */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2218 | NULL, /* get_cb_away */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2219 | NULL, /* alias_buddy */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2220 | msn_group_buddy, /* group_buddy */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2221 | msn_rename_group, /* rename_group */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2222 | NULL, /* buddy_free */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2223 | msn_convo_closed, /* convo_closed */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2224 | msn_normalize, /* normalize */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2225 | msn_set_buddy_icon, /* set_buddy_icon */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2226 | msn_remove_group, /* remove_group */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2227 | NULL, /* get_cb_real_name */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2228 | NULL, /* set_chat_topic */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2229 | NULL, /* find_blist_chat */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2230 | NULL, /* roomlist_get_list */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2231 | NULL, /* roomlist_cancel */ |
|
8c8d4ac992a6
[gaim-migrate @ 10300]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9466
diff
changeset
|
2232 | NULL, /* roomlist_expand_category */ |
|
10116
054b064145a1
[gaim-migrate @ 11153]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10102
diff
changeset
|
2233 | msn_can_receive_file, /* can_receive_file */ |
|
12143
09f216663302
[gaim-migrate @ 14444]
Evan Schoenberg <evands@pidgin.im>
parents:
11992
diff
changeset
|
2234 | msn_send_file, /* send_file */ |
|
12600
7ecd4441fdc7
[gaim-migrate @ 14934]
Richard Laager <rlaager@pidgin.im>
parents:
12595
diff
changeset
|
2235 | msn_new_xfer, /* new_xfer */ |
|
16890
3ea8e90bacd1
Make MSN mobile buddies offline, mobile, and offline-messagable. Fixes #215
Sean Egan <seanegan@pidgin.im>
parents:
16746
diff
changeset
|
2236 | msn_offline_message, /* offline_message */ |
|
12600
7ecd4441fdc7
[gaim-migrate @ 14934]
Richard Laager <rlaager@pidgin.im>
parents:
12595
diff
changeset
|
2237 | NULL, /* whiteboard_prpl_ops */ |
|
14605
2fd8baf4e5fb
[gaim-migrate @ 17264]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14604
diff
changeset
|
2238 | NULL, /* send_raw */ |
| 15185 | 2239 | NULL, /* roomlist_room_serialize */ |
|
16746
72faf41c3c4f
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16545
diff
changeset
|
2240 | |
|
72faf41c3c4f
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16545
diff
changeset
|
2241 | /* padding */ |
|
72faf41c3c4f
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16545
diff
changeset
|
2242 | NULL, |
|
72faf41c3c4f
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16545
diff
changeset
|
2243 | NULL, |
|
72faf41c3c4f
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16545
diff
changeset
|
2244 | NULL, |
|
72faf41c3c4f
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16545
diff
changeset
|
2245 | NULL |
|
5205
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2246 | }; |
|
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2247 | |
| 15884 | 2248 | static PurplePluginInfo info = |
|
5205
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2249 | { |
| 15884 | 2250 | PURPLE_PLUGIN_MAGIC, |
| 2251 | PURPLE_MAJOR_VERSION, | |
| 2252 | PURPLE_MINOR_VERSION, | |
| 2253 | PURPLE_PLUGIN_PROTOCOL, /**< type */ | |
|
5205
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2254 | NULL, /**< ui_requirement */ |
|
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2255 | 0, /**< flags */ |
|
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2256 | NULL, /**< dependencies */ |
| 15884 | 2257 | PURPLE_PRIORITY_DEFAULT, /**< priority */ |
|
5205
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2258 | |
|
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2259 | "prpl-msn", /**< id */ |
|
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2260 | "MSN", /**< name */ |
|
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2261 | VERSION, /**< version */ |
|
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2262 | /** summary */ |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
2263 | N_("Windows Live Messenger Protocol Plugin"), |
|
5205
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2264 | /** description */ |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
2265 | N_("Windows Live Messenger Protocol Plugin"), |
|
20508
a8855578906a
Revert a bunch of whitespace changes so reviewing a diff against
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20505
diff
changeset
|
2266 | "Christian Hammond <chipx86@gnupdate.org>, " |
|
a8855578906a
Revert a bunch of whitespace changes so reviewing a diff against
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20505
diff
changeset
|
2267 | "MaYuan <mayuan2006@gmail.com>", /**< author */ |
| 15884 | 2268 | PURPLE_WEBSITE, /**< homepage */ |
|
5205
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2269 | |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2270 | msn_load, /**< load */ |
|
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2271 | msn_unload, /**< unload */ |
|
5205
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2272 | NULL, /**< destroy */ |
|
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2273 | |
|
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2274 | NULL, /**< ui_info */ |
|
8808
1cb5ddf6b625
[gaim-migrate @ 9570]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8749
diff
changeset
|
2275 | &prpl_info, /**< extra_info */ |
| 10487 | 2276 | NULL, /**< prefs_info */ |
|
16746
72faf41c3c4f
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16545
diff
changeset
|
2277 | msn_actions, |
|
72faf41c3c4f
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16545
diff
changeset
|
2278 | |
|
72faf41c3c4f
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16545
diff
changeset
|
2279 | /* padding */ |
|
72faf41c3c4f
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16545
diff
changeset
|
2280 | NULL, |
|
72faf41c3c4f
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16545
diff
changeset
|
2281 | NULL, |
|
72faf41c3c4f
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16545
diff
changeset
|
2282 | NULL, |
|
72faf41c3c4f
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16545
diff
changeset
|
2283 | NULL |
|
5205
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2284 | }; |
|
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2285 | |
|
242b8aa81328
[gaim-migrate @ 5573]
Christian Hammond <chipx86@chipx86.com>
parents:
5191
diff
changeset
|
2286 | static void |
| 15884 | 2287 | init_plugin(PurplePlugin *plugin) |
| 2086 | 2288 | { |
| 15884 | 2289 | PurpleAccountOption *option; |
| 3572 | 2290 | |
| 15884 | 2291 | option = purple_account_option_string_new(_("Server"), "server", |
| 13853 | 2292 | WLM_SERVER); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5626
diff
changeset
|
2293 | prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5626
diff
changeset
|
2294 | option); |
| 3572 | 2295 | |
|
20478
46933dc62880
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
Richard Laager <rlaager@pidgin.im>
diff
changeset
|
2296 | option = purple_account_option_int_new(_("Port"), "port", WLM_PORT); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5626
diff
changeset
|
2297 | prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5626
diff
changeset
|
2298 | option); |
| 2086 | 2299 | |
| 15884 | 2300 | option = purple_account_option_bool_new(_("Use HTTP Method"), |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
2301 | "http_method", FALSE); |
|
7288
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
7277
diff
changeset
|
2302 | prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
|
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
7277
diff
changeset
|
2303 | option); |
|
486e8b44a14b
[gaim-migrate @ 7869]
Christian Hammond <chipx86@chipx86.com>
parents:
7277
diff
changeset
|
2304 | |
| 15884 | 2305 | option = purple_account_option_bool_new(_("Show custom smileys"), |
|
12886
050f70062d54
[gaim-migrate @ 15238]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12658
diff
changeset
|
2306 | "custom_smileys", TRUE); |
|
050f70062d54
[gaim-migrate @ 15238]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12658
diff
changeset
|
2307 | prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
|
050f70062d54
[gaim-migrate @ 15238]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12658
diff
changeset
|
2308 | option); |
|
050f70062d54
[gaim-migrate @ 15238]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12658
diff
changeset
|
2309 | |
| 15884 | 2310 | purple_cmd_register("nudge", "", PURPLE_CMD_P_PRPL, |
| 2311 | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY, | |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
2312 | "prpl-msn", msn_cmd_nudge, |
|
12318
942b7c089acb
[gaim-migrate @ 14622]
Richard Laager <rlaager@pidgin.im>
parents:
12243
diff
changeset
|
2313 | _("nudge: nudge a user to get their attention"), NULL); |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11257
diff
changeset
|
2314 | |
| 15884 | 2315 | purple_prefs_remove("/plugins/prpl/msn"); |
|
15685
483b223d0b60
uri-handler support for AIM/ICQ, Yahoo and MSN
Daniel Atallah <datallah@pidgin.im>
parents:
15654
diff
changeset
|
2316 | |
| 15884 | 2317 | purple_signal_connect(purple_get_core(), "uri-handler", plugin, |
| 2318 | PURPLE_CALLBACK(msn_uri_handler), NULL); | |
| 2086 | 2319 | } |
| 2320 | ||
| 15884 | 2321 | PURPLE_INIT_PLUGIN(msn, init_plugin, info); |