Mercurial > pidgin.yaz
comparison src/protocols/zephyr/zephyr.c @ 11338:17142948653e
[gaim-migrate @ 13551]
Change the GAIM_CONV_IM and GAIM_CONV_CHAT enums to GAIM_CONV_TYPE_IM
and GAIM_CONV_TYPE_CHAT. This touched A LOT of files. Also combined
two oscar header files (one of them was small and dorky).
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 25 Aug 2005 02:33:44 +0000 |
parents | 90be432e8385 |
children | a26eb48d1953 |
comparison
equal
deleted
inserted
replaced
11337:1462b64f8fc9 | 11338:17142948653e |
---|---|
859 send_inst_utf8 = "malformed instance"; | 859 send_inst_utf8 = "malformed instance"; |
860 } | 860 } |
861 | 861 |
862 serv_got_chat_in(gc, zt2->id, send_inst_utf8, 0, buf3, time(NULL)); | 862 serv_got_chat_in(gc, zt2->id, send_inst_utf8, 0, buf3, time(NULL)); |
863 g_free(send_inst); | 863 g_free(send_inst); |
864 gconv1 = gaim_find_conversation_with_account(GAIM_CONV_CHAT, | 864 gconv1 = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, |
865 zt2->name, gc->account); | 865 zt2->name, gc->account); |
866 gcc = gaim_conversation_get_chat_data(gconv1); | 866 gcc = gaim_conversation_get_chat_data(gconv1); |
867 | 867 |
868 if (!gaim_conv_chat_find_user(gcc, sendertmp)) { | 868 if (!gaim_conv_chat_find_user(gcc, sendertmp)) { |
869 /* force interpretation in network byte order */ | 869 /* force interpretation in network byte order */ |
2006 /* this should never happen. */ | 2006 /* this should never happen. */ |
2007 return -EINVAL; | 2007 return -EINVAL; |
2008 | 2008 |
2009 sig = zephyr_get_signature(); | 2009 sig = zephyr_get_signature(); |
2010 | 2010 |
2011 gconv1 = gaim_find_conversation_with_account(GAIM_CONV_CHAT, zt->name, | 2011 gconv1 = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, zt->name, |
2012 gc->account); | 2012 gc->account); |
2013 gcc = gaim_conversation_get_chat_data(gconv1); | 2013 gcc = gaim_conversation_get_chat_data(gconv1); |
2014 | 2014 |
2015 if (!(inst = (char *)gaim_conv_chat_get_topic(gcc))) | 2015 if (!(inst = (char *)gaim_conv_chat_get_topic(gcc))) |
2016 inst = g_strdup("PERSONAL"); | 2016 inst = g_strdup("PERSONAL"); |
2467 | 2467 |
2468 zt = find_sub_by_id(gc->proto_data,id); | 2468 zt = find_sub_by_id(gc->proto_data,id); |
2469 /* find_sub_by_id can return NULL */ | 2469 /* find_sub_by_id can return NULL */ |
2470 if (!zt) | 2470 if (!zt) |
2471 return; | 2471 return; |
2472 gconv = gaim_find_conversation_with_account(GAIM_CONV_CHAT, zt->name, | 2472 gconv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, zt->name, |
2473 gc->account); | 2473 gc->account); |
2474 gcc = gaim_conversation_get_chat_data(gconv); | 2474 gcc = gaim_conversation_get_chat_data(gconv); |
2475 | 2475 |
2476 topic_utf8 = zephyr_recv_convert(gc,(gchar *)topic,strlen(topic)); | 2476 topic_utf8 = zephyr_recv_convert(gc,(gchar *)topic,strlen(topic)); |
2477 gaim_conv_chat_set_topic(gcc,sender,topic_utf8); | 2477 gaim_conv_chat_set_topic(gcc,sender,topic_utf8); |