Mercurial > pidgin.yaz
comparison src/protocols/silc/silc.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 | 519dc2186438 |
children | 9c7ca8a8c4b8 |
comparison
equal
deleted
inserted
replaced
11337:1462b64f8fc9 | 11338:17142948653e |
---|---|
852 SilcGaimIM im = context; | 852 SilcGaimIM im = context; |
853 GaimConversation *convo; | 853 GaimConversation *convo; |
854 char tmp[256], *nickname = NULL; | 854 char tmp[256], *nickname = NULL; |
855 SilcClientEntry client_entry; | 855 SilcClientEntry client_entry; |
856 | 856 |
857 convo = gaim_find_conversation_with_account(GAIM_CONV_IM, im->nick, | 857 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, im->nick, |
858 sg->account); | 858 sg->account); |
859 if (!convo) | 859 if (!convo) |
860 return; | 860 return; |
861 | 861 |
862 if (!clients) | 862 if (!clients) |
990 | 990 |
991 if (gc == NULL) | 991 if (gc == NULL) |
992 return GAIM_CMD_RET_FAILED; | 992 return GAIM_CMD_RET_FAILED; |
993 | 993 |
994 if(args && args[0]) { | 994 if(args && args[0]) { |
995 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, args[0], | 995 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, args[0], |
996 gc->account); | 996 gc->account); |
997 } else | 997 } else |
998 convo = conv; | 998 convo = conv; |
999 | 999 |
1000 id = gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo)); | 1000 id = gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo)); |
1129 if (gc == NULL) | 1129 if (gc == NULL) |
1130 return GAIM_CMD_RET_FAILED; | 1130 return GAIM_CMD_RET_FAILED; |
1131 | 1131 |
1132 account = gaim_connection_get_account(gc); | 1132 account = gaim_connection_get_account(gc); |
1133 | 1133 |
1134 convo = gaim_conversation_new(GAIM_CONV_IM, account, args[0]); | 1134 convo = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, args[0]); |
1135 | 1135 |
1136 if (args[1]) { | 1136 if (args[1]) { |
1137 ret = silcgaim_send_im(gc, args[0], args[1], GAIM_MESSAGE_SEND); | 1137 ret = silcgaim_send_im(gc, args[0], args[1], GAIM_MESSAGE_SEND); |
1138 gaim_conv_im_write(GAIM_CONV_IM(convo), gaim_connection_get_display_name(gc), | 1138 gaim_conv_im_write(GAIM_CONV_IM(convo), gaim_connection_get_display_name(gc), |
1139 args[1], GAIM_MESSAGE_SEND, time(NULL)); | 1139 args[1], GAIM_MESSAGE_SEND, time(NULL)); |