Sat, 06 Feb 2010 06:32:21 +0000
propagate from branch 'im.pidgin.pidgin' (head 7da7e48a6444806b19290a54d54bcf86bba3f508)
to branch 'im.pidgin.pidgin.next.minor' (head d5409dbda6e7f2592fbc5f8643c1ca28a30e728c)
| 5361 | 1 | /** |
| 2 | * @file state.c State functions and definitions | |
| 3 | * | |
| 15884 | 4 | * purple |
| 5361 | 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:
5824
diff
changeset
|
9 | * |
| 5361 | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | * it under the terms of the GNU General Public License as published by | |
| 12 | * the Free Software Foundation; either version 2 of the License, or | |
| 13 | * (at your option) any later version. | |
| 14 | * | |
| 15 | * This program is distributed in the hope that it will be useful, | |
| 16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 18 | * GNU General Public License for more details. | |
| 19 | * | |
| 20 | * You should have received a copy of the GNU General Public License | |
| 21 | * along with this program; if not, write to the Free Software | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
15884
diff
changeset
|
22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 5361 | 23 | */ |
|
25579
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
24 | |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
25 | #include "internal.h" |
|
29305
202cb72ed5b0
Minor header file cleanup. Mostly I wanted to move some enums above some #includes
Mark Doliner <markdoliner@pidgin.im>
parents:
29300
diff
changeset
|
26 | |
|
25579
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
27 | #include "core.h" |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
28 | |
| 5361 | 29 | #include "msn.h" |
| 30 | #include "state.h" | |
| 31 | ||
| 32 | static const char *away_text[] = | |
| 33 | { | |
| 34 | N_("Available"), | |
| 35 | N_("Available"), | |
| 36 | N_("Busy"), | |
| 37 | N_("Idle"), | |
| 38 | N_("Be Right Back"), | |
| 39 | N_("Away From Computer"), | |
| 40 | N_("On The Phone"), | |
| 41 | N_("Out To Lunch"), | |
| 42 | N_("Available"), | |
| 43 | N_("Available") | |
| 44 | }; | |
| 45 | ||
| 13866 | 46 | /* Local Function Prototype*/ |
|
20474
b0ef257ef8d4
The second msn.tgz from SF Patch #1621854 from Ka-Hing Cheung.
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
47 | static char *msn_build_psm(const char *psmstr,const char *mediastr, |
|
b0ef257ef8d4
The second msn.tgz from SF Patch #1621854 from Ka-Hing Cheung.
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
48 | const char *guidstr); |
| 13866 | 49 | |
| 50 | /* | |
| 51 | * WLM media PSM info build prcedure | |
| 52 | * | |
| 53 | * Result can like: | |
|
20591
8469ac3acbec
Various (untested) changes to the CurrentMedia parsing. This code is a
Richard Laager <rlaager@pidgin.im>
parents:
20590
diff
changeset
|
54 | * <CurrentMedia>\0Music\01\0{0} - {1}\0Song Title\0Song Artist\0Song Album\0\0</CurrentMedia>\ |
| 13866 | 55 | * <CurrentMedia>\0Games\01\0Playing {0}\0Game Name\0</CurrentMedia>\ |
| 56 | * <CurrentMedia>\0Office\01\0Office Message\0Office App Name\0</CurrentMedia>" | |
| 57 | */ | |
|
20474
b0ef257ef8d4
The second msn.tgz from SF Patch #1621854 from Ka-Hing Cheung.
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
58 | static char * |
|
b0ef257ef8d4
The second msn.tgz from SF Patch #1621854 from Ka-Hing Cheung.
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
59 | msn_build_psm(const char *psmstr,const char *mediastr, const char *guidstr) |
| 13856 | 60 | { |
| 61 | xmlnode *dataNode,*psmNode,*mediaNode,*guidNode; | |
| 62 | char *result; | |
| 63 | int length; | |
| 64 | ||
| 65 | dataNode = xmlnode_new("Data"); | |
| 66 | ||
| 67 | psmNode = xmlnode_new("PSM"); | |
| 68 | if(psmstr != NULL){ | |
|
24025
7827cb5dabe2
Rely on xmlnode_insert_data to call strlen on a bunch of MSN status strings.
Will Thompson <resiak@pidgin.im>
parents:
23830
diff
changeset
|
69 | xmlnode_insert_data(psmNode, psmstr, -1); |
| 13856 | 70 | } |
|
24025
7827cb5dabe2
Rely on xmlnode_insert_data to call strlen on a bunch of MSN status strings.
Will Thompson <resiak@pidgin.im>
parents:
23830
diff
changeset
|
71 | xmlnode_insert_child(dataNode, psmNode); |
| 13856 | 72 | |
| 73 | mediaNode = xmlnode_new("CurrentMedia"); | |
| 74 | if(mediastr != NULL){ | |
|
24025
7827cb5dabe2
Rely on xmlnode_insert_data to call strlen on a bunch of MSN status strings.
Will Thompson <resiak@pidgin.im>
parents:
23830
diff
changeset
|
75 | xmlnode_insert_data(mediaNode, mediastr, -1); |
| 13856 | 76 | } |
|
24025
7827cb5dabe2
Rely on xmlnode_insert_data to call strlen on a bunch of MSN status strings.
Will Thompson <resiak@pidgin.im>
parents:
23830
diff
changeset
|
77 | xmlnode_insert_child(dataNode, mediaNode); |
| 13856 | 78 | |
| 79 | guidNode = xmlnode_new("MachineGuid"); | |
| 80 | if(guidstr != NULL){ | |
|
24025
7827cb5dabe2
Rely on xmlnode_insert_data to call strlen on a bunch of MSN status strings.
Will Thompson <resiak@pidgin.im>
parents:
23830
diff
changeset
|
81 | xmlnode_insert_data(guidNode, guidstr, -1); |
| 13856 | 82 | } |
|
24025
7827cb5dabe2
Rely on xmlnode_insert_data to call strlen on a bunch of MSN status strings.
Will Thompson <resiak@pidgin.im>
parents:
23830
diff
changeset
|
83 | xmlnode_insert_child(dataNode, guidNode); |
| 13856 | 84 | |
|
24025
7827cb5dabe2
Rely on xmlnode_insert_data to call strlen on a bunch of MSN status strings.
Will Thompson <resiak@pidgin.im>
parents:
23830
diff
changeset
|
85 | result = xmlnode_to_str(dataNode, &length); |
|
20574
41544383ab30
Plug some leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20551
diff
changeset
|
86 | xmlnode_free(dataNode); |
| 13856 | 87 | return result; |
| 88 | } | |
| 89 | ||
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
90 | /* get the CurrentMedia info from the XML string */ |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
91 | char * |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
92 | msn_get_currentmedia(char *xml_str, gsize len) |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
93 | { |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
94 | xmlnode *payloadNode, *currentmediaNode; |
|
20578
82571739414b
Fix some memory leaks. Free xmlnodes properly using xmlnode_free instead of
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20574
diff
changeset
|
95 | char *currentmedia; |
|
23441
fd45c23a3eb2
Delete trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
22969
diff
changeset
|
96 | |
|
23830
1436e3de5d6c
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23441
diff
changeset
|
97 | purple_debug_info("msn", "Get CurrentMedia\n"); |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
98 | payloadNode = xmlnode_from_str(xml_str, len); |
|
23830
1436e3de5d6c
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23441
diff
changeset
|
99 | if (!payloadNode) { |
|
1436e3de5d6c
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23441
diff
changeset
|
100 | purple_debug_error("msn", "PSM XML parse Error!\n"); |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
101 | return NULL; |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
102 | } |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
103 | currentmediaNode = xmlnode_get_child(payloadNode, "CurrentMedia"); |
|
23830
1436e3de5d6c
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23441
diff
changeset
|
104 | if (currentmediaNode == NULL) { |
|
26474
69f112d09563
Add some missing newlines in debug messages.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25638
diff
changeset
|
105 | purple_debug_info("msn", "No CurrentMedia Node\n"); |
|
20578
82571739414b
Fix some memory leaks. Free xmlnodes properly using xmlnode_free instead of
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20574
diff
changeset
|
106 | xmlnode_free(payloadNode); |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
107 | return NULL; |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
108 | } |
|
20578
82571739414b
Fix some memory leaks. Free xmlnodes properly using xmlnode_free instead of
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20574
diff
changeset
|
109 | currentmedia = xmlnode_get_data(currentmediaNode); |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
110 | |
|
20578
82571739414b
Fix some memory leaks. Free xmlnodes properly using xmlnode_free instead of
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20574
diff
changeset
|
111 | xmlnode_free(payloadNode); |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
112 | |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
113 | return currentmedia; |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
114 | } |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
115 | |
| 13888 | 116 | /*get the PSM info from the XML string*/ |
|
20474
b0ef257ef8d4
The second msn.tgz from SF Patch #1621854 from Ka-Hing Cheung.
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
117 | char * |
|
b0ef257ef8d4
The second msn.tgz from SF Patch #1621854 from Ka-Hing Cheung.
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
118 | msn_get_psm(char *xml_str, gsize len) |
| 13888 | 119 | { |
| 120 | xmlnode *payloadNode, *psmNode; | |
|
20578
82571739414b
Fix some memory leaks. Free xmlnodes properly using xmlnode_free instead of
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20574
diff
changeset
|
121 | char *psm; |
|
23441
fd45c23a3eb2
Delete trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
22969
diff
changeset
|
122 | |
|
23830
1436e3de5d6c
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23441
diff
changeset
|
123 | purple_debug_info("msn", "msn get PSM\n"); |
| 13888 | 124 | payloadNode = xmlnode_from_str(xml_str, len); |
|
25638
d0923c8063de
I thought I did this already, but anyway, a patch from Dimmuxx to stop the
Daniel Ljungborg <dimmuxx@yahoo.se>
parents:
24772
diff
changeset
|
125 | if (!payloadNode) { |
|
23830
1436e3de5d6c
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23441
diff
changeset
|
126 | purple_debug_error("msn", "PSM XML parse Error!\n"); |
| 13888 | 127 | return NULL; |
| 128 | } | |
| 129 | psmNode = xmlnode_get_child(payloadNode, "PSM"); | |
|
25638
d0923c8063de
I thought I did this already, but anyway, a patch from Dimmuxx to stop the
Daniel Ljungborg <dimmuxx@yahoo.se>
parents:
24772
diff
changeset
|
130 | if (psmNode == NULL) { |
|
26474
69f112d09563
Add some missing newlines in debug messages.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25638
diff
changeset
|
131 | purple_debug_info("msn", "No PSM status Node\n"); |
|
20578
82571739414b
Fix some memory leaks. Free xmlnodes properly using xmlnode_free instead of
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20574
diff
changeset
|
132 | xmlnode_free(payloadNode); |
| 13888 | 133 | return NULL; |
| 134 | } | |
|
20578
82571739414b
Fix some memory leaks. Free xmlnodes properly using xmlnode_free instead of
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20574
diff
changeset
|
135 | psm = xmlnode_get_data(psmNode); |
| 13888 | 136 | |
|
20578
82571739414b
Fix some memory leaks. Free xmlnodes properly using xmlnode_free instead of
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20574
diff
changeset
|
137 | xmlnode_free(payloadNode); |
| 13888 | 138 | |
| 139 | return psm; | |
| 140 | } | |
| 141 | ||
|
21193
e918a1846d03
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20608
diff
changeset
|
142 | static char * |
|
e918a1846d03
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20608
diff
changeset
|
143 | create_media_string(PurplePresence *presence) |
|
e918a1846d03
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20608
diff
changeset
|
144 | { |
|
24772
c87747478d71
Only get the artist and album if we are setting a Music mediatype.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24771
diff
changeset
|
145 | const char *title, *game, *office; |
|
21193
e918a1846d03
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20608
diff
changeset
|
146 | char *ret; |
|
e918a1846d03
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20608
diff
changeset
|
147 | PurpleStatus *status = purple_presence_get_status(presence, "tune"); |
|
e918a1846d03
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20608
diff
changeset
|
148 | if (!status || !purple_status_is_active(status)) |
|
25638
d0923c8063de
I thought I did this already, but anyway, a patch from Dimmuxx to stop the
Daniel Ljungborg <dimmuxx@yahoo.se>
parents:
24772
diff
changeset
|
149 | return NULL; |
|
21193
e918a1846d03
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20608
diff
changeset
|
150 | |
|
24771
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
151 | title = purple_status_get_attr_string(status, PURPLE_TUNE_TITLE); |
|
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
152 | game = purple_status_get_attr_string(status, "game"); |
|
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
153 | office = purple_status_get_attr_string(status, "office"); |
|
21193
e918a1846d03
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20608
diff
changeset
|
154 | |
|
24772
c87747478d71
Only get the artist and album if we are setting a Music mediatype.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24771
diff
changeset
|
155 | if (title && *title) { |
|
c87747478d71
Only get the artist and album if we are setting a Music mediatype.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24771
diff
changeset
|
156 | const char *artist = purple_status_get_attr_string(status, PURPLE_TUNE_ARTIST); |
|
c87747478d71
Only get the artist and album if we are setting a Music mediatype.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24771
diff
changeset
|
157 | const char *album = purple_status_get_attr_string(status, PURPLE_TUNE_ALBUM); |
|
24771
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
158 | ret = g_strdup_printf("WMP\\0Music\\01\\0{0}%s%s\\0%s\\0%s\\0%s\\0", |
|
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
159 | artist ? " - {1}" : "", |
|
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
160 | album ? " ({2})" : "", |
|
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
161 | title, |
|
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
162 | artist ? artist : "", |
|
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
163 | album ? album : ""); |
|
24772
c87747478d71
Only get the artist and album if we are setting a Music mediatype.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24771
diff
changeset
|
164 | } |
|
24771
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
165 | else if (game && *game) |
|
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
166 | ret = g_strdup_printf("\\0Games\\01\\0Playing {0}\\0%s\\0", game); |
|
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
167 | else if (office && *office) |
|
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
168 | ret = g_strdup_printf("\\0Office\\01\\0Editing {0}\\0%s\\0", office); |
|
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
169 | else |
|
25638
d0923c8063de
I thought I did this already, but anyway, a patch from Dimmuxx to stop the
Daniel Ljungborg <dimmuxx@yahoo.se>
parents:
24772
diff
changeset
|
170 | ret = NULL; |
|
24771
7a17ecc0c85b
Add the Games and Office media to MSN as attributes tacked on to the tune
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24025
diff
changeset
|
171 | |
|
21193
e918a1846d03
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20608
diff
changeset
|
172 | return ret; |
|
e918a1846d03
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20608
diff
changeset
|
173 | } |
|
e918a1846d03
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20608
diff
changeset
|
174 | |
|
23441
fd45c23a3eb2
Delete trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
22969
diff
changeset
|
175 | /* set the MSN's PSM info,Currently Read from the status Line |
| 13891 | 176 | * Thanks for Cris Code |
| 177 | */ | |
| 13856 | 178 | void |
| 179 | msn_set_psm(MsnSession *session) | |
| 180 | { | |
|
27495
8fd70382bf7b
We shouldn't de-reference variables before checking if they're not NULL.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27296
diff
changeset
|
181 | PurpleAccount *account; |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
182 | PurplePresence *presence; |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
183 | PurpleStatus *status; |
| 13856 | 184 | MsnCmdProc *cmdproc; |
| 185 | MsnTransaction *trans; | |
|
20474
b0ef257ef8d4
The second msn.tgz from SF Patch #1621854 from Ka-Hing Cheung.
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
186 | char *payload; |
|
b0ef257ef8d4
The second msn.tgz from SF Patch #1621854 from Ka-Hing Cheung.
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
187 | const char *statusline; |
|
21453
a90cf329cd48
propagate from branch 'im.pidgin.pidgin.next.minor' (head 2f91b326b3f073672c2475a8c30a06826da9b82f)
Ka-Hing Cheung <khc@pidgin.im>
diff
changeset
|
188 | gchar *statusline_stripped, *media = NULL; |
| 13891 | 189 | |
| 190 | g_return_if_fail(session != NULL); | |
| 191 | g_return_if_fail(session->notification != NULL); | |
| 13856 | 192 | |
|
27495
8fd70382bf7b
We shouldn't de-reference variables before checking if they're not NULL.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27296
diff
changeset
|
193 | account = session->account; |
| 13856 | 194 | cmdproc = session->notification->cmdproc; |
|
21073
a2f27248579c
MSN personal status messages are plain text, not HTML. Previously, we were unescaping the message but not stripping it, which left any HTML tags intact.
Evan Schoenberg <evands@pidgin.im>
parents:
20608
diff
changeset
|
195 | |
|
a2f27248579c
MSN personal status messages are plain text, not HTML. Previously, we were unescaping the message but not stripping it, which left any HTML tags intact.
Evan Schoenberg <evands@pidgin.im>
parents:
20608
diff
changeset
|
196 | /* Get the PSM string from Purple's Status Line */ |
|
16183
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
197 | presence = purple_account_get_presence(account); |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
198 | status = purple_presence_get_active_status(presence); |
|
92409c474659
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@pidgin.im>
parents:
15884
diff
changeset
|
199 | statusline = purple_status_get_attr_string(status, "message"); |
|
21073
a2f27248579c
MSN personal status messages are plain text, not HTML. Previously, we were unescaping the message but not stripping it, which left any HTML tags intact.
Evan Schoenberg <evands@pidgin.im>
parents:
20608
diff
changeset
|
200 | |
|
a2f27248579c
MSN personal status messages are plain text, not HTML. Previously, we were unescaping the message but not stripping it, which left any HTML tags intact.
Evan Schoenberg <evands@pidgin.im>
parents:
20608
diff
changeset
|
201 | /* MSN expects plain text, not HTML */ |
|
a2f27248579c
MSN personal status messages are plain text, not HTML. Previously, we were unescaping the message but not stripping it, which left any HTML tags intact.
Evan Schoenberg <evands@pidgin.im>
parents:
20608
diff
changeset
|
202 | statusline_stripped = purple_markup_strip_html(statusline); |
|
21193
e918a1846d03
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
20608
diff
changeset
|
203 | media = create_media_string(presence); |
|
21073
a2f27248579c
MSN personal status messages are plain text, not HTML. Previously, we were unescaping the message but not stripping it, which left any HTML tags intact.
Evan Schoenberg <evands@pidgin.im>
parents:
20608
diff
changeset
|
204 | g_free(session->psm); |
|
21453
a90cf329cd48
propagate from branch 'im.pidgin.pidgin.next.minor' (head 2f91b326b3f073672c2475a8c30a06826da9b82f)
Ka-Hing Cheung <khc@pidgin.im>
diff
changeset
|
205 | session->psm = msn_build_psm(statusline_stripped, media, NULL); |
|
21073
a2f27248579c
MSN personal status messages are plain text, not HTML. Previously, we were unescaping the message but not stripping it, which left any HTML tags intact.
Evan Schoenberg <evands@pidgin.im>
parents:
20608
diff
changeset
|
206 | |
| 13856 | 207 | payload = session->psm; |
|
23830
1436e3de5d6c
The great MSN debug message cleanup! Threw in a few whitespace fixes,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23441
diff
changeset
|
208 | purple_debug_misc("msn", "Sending UUX command with payload: %s\n", payload); |
|
22969
51f5e7777915
This cleans up a bunch of warnings that stem from the fact that size_t and
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22965
diff
changeset
|
209 | trans = msn_transaction_new(cmdproc, "UUX", "%" G_GSIZE_FORMAT, strlen(payload)); |
| 13856 | 210 | msn_transaction_set_payload(trans, payload, strlen(payload)); |
| 211 | msn_cmdproc_send_trans(cmdproc, trans); | |
| 21906 | 212 | |
| 213 | g_free(statusline_stripped); | |
| 214 | g_free(media); | |
| 13856 | 215 | } |
| 216 | ||
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
217 | void |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
218 | msn_change_status(MsnSession *session) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
219 | { |
| 15884 | 220 | PurpleAccount *account; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
221 | MsnCmdProc *cmdproc; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
222 | MsnUser *user; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
223 | MsnObject *msnobj; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
224 | const char *state_text; |
|
25579
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
225 | GHashTable *ui_info = purple_core_get_ui_info(); |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
226 | MsnClientCaps caps = MSN_CLIENT_ID; |
|
27292
1e8a952548f9
Whitespace + a change cluttering up the diff with im.pidgin.pidgin
Paul Aurich <darkrain42@pidgin.im>
parents:
26684
diff
changeset
|
227 | |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9262
diff
changeset
|
228 | g_return_if_fail(session != NULL); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9262
diff
changeset
|
229 | g_return_if_fail(session->notification != NULL); |
|
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9262
diff
changeset
|
230 | |
|
25579
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
231 | /* set client caps based on what the UI tells us it is... */ |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
232 | if (ui_info) { |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
233 | const gchar *client_type = g_hash_table_lookup(ui_info, "client_type"); |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
234 | if (client_type) { |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
235 | if (strcmp(client_type, "phone") == 0 || |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
236 | strcmp(client_type, "handheld") == 0) { |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
237 | caps |= MSN_CLIENT_CAP_WIN_MOBILE; |
|
27296
31e4b491abae
These strcmp checks are for equality, meaning a return of 0.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27292
diff
changeset
|
238 | } else if (strcmp(client_type, "web") == 0) { |
|
25579
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
239 | caps |= MSN_CLIENT_CAP_WEBMSGR; |
|
27296
31e4b491abae
These strcmp checks are for equality, meaning a return of 0.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27292
diff
changeset
|
240 | } else if (strcmp(client_type, "bot") == 0) { |
|
25579
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
241 | caps |= MSN_CLIENT_CAP_BOT; |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
242 | } |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
243 | /* MSN doesn't a "console" type... |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
244 | What, they have no ncurses UI? :-) */ |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
245 | } |
|
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
246 | } |
|
27292
1e8a952548f9
Whitespace + a change cluttering up the diff with im.pidgin.pidgin
Paul Aurich <darkrain42@pidgin.im>
parents:
26684
diff
changeset
|
247 | |
|
14453
1cc75906700c
[gaim-migrate @ 17098]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
248 | account = session->account; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
249 | cmdproc = session->notification->cmdproc; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
250 | user = session->user; |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
251 | state_text = msn_state_get_text(msn_state_from_account(account)); |
|
10908
15694532c3c6
[gaim-migrate @ 12640]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10481
diff
changeset
|
252 | |
|
15694532c3c6
[gaim-migrate @ 12640]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10481
diff
changeset
|
253 | /* If we're not logged in yet, don't send the status to the server, |
|
15694532c3c6
[gaim-migrate @ 12640]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10481
diff
changeset
|
254 | * it will be sent when login completes |
|
15694532c3c6
[gaim-migrate @ 12640]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10481
diff
changeset
|
255 | */ |
|
15694532c3c6
[gaim-migrate @ 12640]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10481
diff
changeset
|
256 | if (!session->logged_in) |
|
15694532c3c6
[gaim-migrate @ 12640]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10481
diff
changeset
|
257 | return; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
258 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
259 | msnobj = msn_user_get_object(user); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
260 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
261 | if (msnobj == NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
262 | { |
|
25579
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
263 | msn_cmdproc_send(cmdproc, "CHG", "%s %d", state_text, caps); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
264 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
265 | else |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
266 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
267 | char *msnobj_str; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
268 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
269 | msnobj_str = msn_object_to_string(msnobj); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
270 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
271 | msn_cmdproc_send(cmdproc, "CHG", "%s %d %s", state_text, |
|
25579
256aa4861079
Sätt client type on MSN.
Marcus Lundblad <malu@pidgin.im>
parents:
24772
diff
changeset
|
272 | caps, purple_url_encode(msnobj_str)); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
273 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
274 | g_free(msnobj_str); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
275 | } |
| 13891 | 276 | msn_set_psm(session); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
277 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
278 | |
| 5361 | 279 | const char * |
| 280 | msn_away_get_text(MsnAwayType type) | |
| 281 | { | |
| 7631 | 282 | g_return_val_if_fail(type <= MSN_HIDDEN, NULL); |
| 5361 | 283 | |
|
5824
cbae51183b18
[gaim-migrate @ 6254]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
5361
diff
changeset
|
284 | return _(away_text[type]); |
| 5361 | 285 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
286 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
287 | const char * |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
288 | msn_state_get_text(MsnAwayType state) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
289 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
290 | static char *status_text[] = |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
291 | { "NLN", "NLN", "BSY", "IDL", "BRB", "AWY", "PHN", "LUN", "HDN", "HDN" }; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
292 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
293 | return status_text[state]; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
294 | } |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
295 | |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
296 | MsnAwayType |
| 15884 | 297 | msn_state_from_account(PurpleAccount *account) |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
298 | { |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
299 | MsnAwayType msnstatus; |
| 15884 | 300 | PurplePresence *presence; |
| 301 | PurpleStatus *status; | |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
302 | const char *status_id; |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
303 | |
| 15884 | 304 | presence = purple_account_get_presence(account); |
| 305 | status = purple_presence_get_active_status(presence); | |
| 306 | status_id = purple_status_get_id(status); | |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
307 | |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
308 | if (!strcmp(status_id, "away")) |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
309 | msnstatus = MSN_AWAY; |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
310 | else if (!strcmp(status_id, "brb")) |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
311 | msnstatus = MSN_BRB; |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
312 | else if (!strcmp(status_id, "busy")) |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
313 | msnstatus = MSN_BUSY; |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
314 | else if (!strcmp(status_id, "phone")) |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
315 | msnstatus = MSN_PHONE; |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
316 | else if (!strcmp(status_id, "lunch")) |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
317 | msnstatus = MSN_LUNCH; |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
318 | else if (!strcmp(status_id, "invisible")) |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
319 | msnstatus = MSN_HIDDEN; |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
320 | else |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
321 | msnstatus = MSN_ONLINE; |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
322 | |
| 15884 | 323 | if ((msnstatus == MSN_ONLINE) && purple_presence_is_idle(presence)) |
|
11992
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
324 | msnstatus = MSN_IDLE; |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
325 | |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
326 | return msnstatus; |
|
906176cc9b22
[gaim-migrate @ 14285]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10908
diff
changeset
|
327 | } |