Mercurial > pidgin.yaz
comparison src/protocols/silc/buddy.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 | 07dc8c6a359f |
| children | 9c7ca8a8c4b8 |
comparison
equal
deleted
inserted
replaced
| 11337:1462b64f8fc9 | 11338:17142948653e |
|---|---|
| 91 silc_client_add_private_message_key_ske(client, conn, client_entry, | 91 silc_client_add_private_message_key_ske(client, conn, client_entry, |
| 92 NULL, NULL, key, a->responder); | 92 NULL, NULL, key, a->responder); |
| 93 silc_ske_free_key_material(key); | 93 silc_ske_free_key_material(key); |
| 94 | 94 |
| 95 /* Open IM window */ | 95 /* Open IM window */ |
| 96 convo = gaim_find_conversation_with_account(GAIM_CONV_IM, | 96 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, |
| 97 client_entry->nickname, sg->account); | 97 client_entry->nickname, sg->account); |
| 98 if (convo) | 98 if (convo) |
| 99 gaim_conv_window_show(gaim_conversation_get_window(convo)); | 99 gaim_conv_window_show(gaim_conversation_get_window(convo)); |
| 100 else | 100 else |
| 101 convo = gaim_conversation_new(GAIM_CONV_IM, sg->account, | 101 convo = gaim_conversation_new(GAIM_CONV_TYPE_IM, sg->account, |
| 102 client_entry->nickname); | 102 client_entry->nickname); |
| 103 g_snprintf(tmp, sizeof(tmp), "%s [private key]", client_entry->nickname); | 103 g_snprintf(tmp, sizeof(tmp), "%s [private key]", client_entry->nickname); |
| 104 gaim_conversation_set_title(convo, tmp); | 104 gaim_conversation_set_title(convo, tmp); |
| 105 } | 105 } |
| 106 break; | 106 break; |