comparison src/gtkutils.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 ad9a61894d9b
children b47708f46a38
comparison
equal deleted inserted replaced
11337:1462b64f8fc9 11338:17142948653e
1399 break; 1399 break;
1400 case DND_FILE_TRANSFER: 1400 case DND_FILE_TRANSFER:
1401 serv_send_file(gaim_account_get_connection(data->account), data->who, data->filename); 1401 serv_send_file(gaim_account_get_connection(data->account), data->who, data->filename);
1402 break; 1402 break;
1403 case DND_IM_IMAGE: 1403 case DND_IM_IMAGE:
1404 conv = gaim_conversation_new(GAIM_CONV_IM, data->account, data->who); 1404 conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, data->account, data->who);
1405 gtkconv = GAIM_GTK_CONVERSATION(conv); 1405 gtkconv = GAIM_GTK_CONVERSATION(conv);
1406 1406
1407 if (!g_file_get_contents(data->filename, &filedata, &size, 1407 if (!g_file_get_contents(data->filename, &filedata, &size,
1408 &err)) { 1408 &err)) {
1409 char *str; 1409 char *str;
1572 switch (dtype) { 1572 switch (dtype) {
1573 GaimConversation *conv; 1573 GaimConversation *conv;
1574 GaimGtkConversation *gtkconv; 1574 GaimGtkConversation *gtkconv;
1575 1575
1576 case GAIM_DESKTOP_ITEM_TYPE_LINK: 1576 case GAIM_DESKTOP_ITEM_TYPE_LINK:
1577 conv = gaim_conversation_new(GAIM_CONV_IM, account, who); 1577 conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, who);
1578 gtkconv = GAIM_GTK_CONVERSATION(conv); 1578 gtkconv = GAIM_GTK_CONVERSATION(conv);
1579 gtk_imhtml_insert_link(GTK_IMHTML(gtkconv->entry), 1579 gtk_imhtml_insert_link(GTK_IMHTML(gtkconv->entry),
1580 gtk_text_buffer_get_insert(GTK_IMHTML(gtkconv->entry)->text_buffer), 1580 gtk_text_buffer_get_insert(GTK_IMHTML(gtkconv->entry)->text_buffer),
1581 gaim_desktop_item_get_string(item, "URL"), itemname); 1581 gaim_desktop_item_get_string(item, "URL"), itemname);
1582 break; 1582 break;