Mercurial > pidgin.yaz
diff finch/gntsound.c @ 27760:e9cf897bd873
propagate from branch 'im.pidgin.pidgin' (head ae7f8e3acb446776f833c3b44514295ae56184b3)
to branch 'im.pidgin.pidgin.yaz' (head 952151791a1f3b4e3469a5621f4cfa2de608a8b8)
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Wed, 30 Jan 2008 10:53:22 +0000 |
| parents | 5152a14d06a3 |
| children | b7be2d6f96a3 |
line wrap: on
line diff
--- a/finch/gntsound.c Thu Jan 10 05:32:41 2008 +0000 +++ b/finch/gntsound.c Wed Jan 30 10:53:22 2008 +0000 @@ -23,7 +23,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#include "internal.h" #include "finch.h" #ifdef _WIN32 @@ -142,13 +141,15 @@ char *nick = NULL; char *name = NULL; gboolean ret = FALSE; + PurpleAccount *account; + chat = purple_conversation_get_chat_data(conv); - if (chat == NULL) return ret; - nick = g_strdup(purple_normalize(conv->account, chat->nick)); - name = g_strdup(purple_normalize(conv->account, aname)); + account = purple_conversation_get_account(conv); + nick = g_strdup(purple_normalize(account, chat->nick)); + name = g_strdup(purple_normalize(account, aname)); if (g_utf8_collate(nick, name) == 0) ret = TRUE;