Mercurial > pidgin
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/myspace/user.c Fri Jan 02 22:23:58 2009 +0000 +++ b/libpurple/protocols/myspace/user.c Fri Jan 02 22:28:34 2009 +0000 @@ -412,10 +412,11 @@ } if (msim_msg_get_integer(msg, "dsn") == MG_OWN_IM_INFO_DSN && - msim_msg_get_integer(msg, "lid") == MG_OWN_IM_INFO_LID) { + msim_msg_get_integer(msg, "lid") == MG_OWN_IM_INFO_LID) + { /* * Some of this info will be available on the buddy list if the - * has themselves as their own buddy. + * user has themselves as their own buddy. * * Much of the info is already available in MsimSession, * stored in msim_we_are_logged_on(). @@ -437,7 +438,7 @@ "idlist", MSIM_TYPE_STRING, g_strdup_printf("w%d|c%d", session->show_only_to_list ? 1 : 0, - session->privacy_mode), + session->privacy_mode & 1), NULL); } else if (msim_msg_get_integer(msg, "dsn") == MG_OWN_MYSPACE_INFO_DSN && msim_msg_get_integer(msg, "lid") == MG_OWN_MYSPACE_INFO_LID) {