Mercurial > pidgin
comparison libpurple/protocols/myspace/user.c @ 25890:43b721aa4b76
explicit merge of '32d4ce0b6cfc9ccb9a6e7ed661423b9260a0bead'
and '0bcc8cd8e68241cf9c13be5b28ced3a4a5d4e488'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 02 Jan 2009 22:28:34 +0000 |
| parents | 4e8748f3374f 1d77f138847b |
| children | c0b42d6c2785 |
comparison
equal
deleted
inserted
replaced
| 25889:e2b193decaa5 | 25890:43b721aa4b76 |
|---|---|
| 410 if (!body) { | 410 if (!body) { |
| 411 return FALSE; | 411 return FALSE; |
| 412 } | 412 } |
| 413 | 413 |
| 414 if (msim_msg_get_integer(msg, "dsn") == MG_OWN_IM_INFO_DSN && | 414 if (msim_msg_get_integer(msg, "dsn") == MG_OWN_IM_INFO_DSN && |
| 415 msim_msg_get_integer(msg, "lid") == MG_OWN_IM_INFO_LID) { | 415 msim_msg_get_integer(msg, "lid") == MG_OWN_IM_INFO_LID) |
| 416 { | |
| 416 /* | 417 /* |
| 417 * Some of this info will be available on the buddy list if the | 418 * Some of this info will be available on the buddy list if the |
| 418 * has themselves as their own buddy. | 419 * user has themselves as their own buddy. |
| 419 * | 420 * |
| 420 * Much of the info is already available in MsimSession, | 421 * Much of the info is already available in MsimSession, |
| 421 * stored in msim_we_are_logged_on(). | 422 * stored in msim_we_are_logged_on(). |
| 422 */ | 423 */ |
| 423 gchar *tmpstr; | 424 gchar *tmpstr; |
| 435 "blocklist", MSIM_TYPE_BOOLEAN, TRUE, | 436 "blocklist", MSIM_TYPE_BOOLEAN, TRUE, |
| 436 "sesskey", MSIM_TYPE_INTEGER, session->sesskey, | 437 "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
| 437 "idlist", MSIM_TYPE_STRING, | 438 "idlist", MSIM_TYPE_STRING, |
| 438 g_strdup_printf("w%d|c%d", | 439 g_strdup_printf("w%d|c%d", |
| 439 session->show_only_to_list ? 1 : 0, | 440 session->show_only_to_list ? 1 : 0, |
| 440 session->privacy_mode), | 441 session->privacy_mode & 1), |
| 441 NULL); | 442 NULL); |
| 442 } else if (msim_msg_get_integer(msg, "dsn") == MG_OWN_MYSPACE_INFO_DSN && | 443 } else if (msim_msg_get_integer(msg, "dsn") == MG_OWN_MYSPACE_INFO_DSN && |
| 443 msim_msg_get_integer(msg, "lid") == MG_OWN_MYSPACE_INFO_LID) { | 444 msim_msg_get_integer(msg, "lid") == MG_OWN_MYSPACE_INFO_LID) { |
| 444 /* TODO: same as above, but for MySpace info. */ | 445 /* TODO: same as above, but for MySpace info. */ |
| 445 } | 446 } |