Mercurial > pidgin.yaz
diff libpurple/protocols/silc/silcpurple.h @ 31449:1c660ba17ba1
propagate from branch 'im.pidgin.pidgin' (head 6f879669a6513a5c40335bbaefe842389a92b39e)
to branch 'im.pidgin.cpw.qulogic.cairo' (head 4ab0199887f74442673fd46dcbb662bc7f070bc4)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 21 Nov 2010 20:30:12 +0000 |
parents | 1cdae196aac8 |
children | a9f13cb4e945 |
line wrap: on
line diff
--- a/libpurple/protocols/silc/silcpurple.h Sat Aug 21 06:04:13 2010 +0000 +++ b/libpurple/protocols/silc/silcpurple.h Sun Nov 21 20:30:12 2010 +0000 @@ -85,7 +85,7 @@ SilcMimeAssembler mimeass; unsigned int detaching : 1; unsigned int resuming : 1; - unsigned int roomlist_canceled : 1; + unsigned int roomlist_cancelled : 1; unsigned int chpk : 1; } *SilcPurple;