libpurple/ft.c

branch
soc.2013.gobjectification
changeset 34622
753f46dd000f
parent 33940
b44d15793c83
child 34625
03d62b1660fc
equal deleted inserted replaced
34621:66308be62d23 34622:753f46dd000f
287 g_return_if_fail(xfer != NULL); 287 g_return_if_fail(xfer != NULL);
288 g_return_if_fail(message != NULL); 288 g_return_if_fail(message != NULL);
289 289
290 thumbnail_data = purple_xfer_get_thumbnail(xfer, &size); 290 thumbnail_data = purple_xfer_get_thumbnail(xfer, &size);
291 291
292 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, xfer->who, 292 conv = purple_conversations_find_with_account(PURPLE_CONV_TYPE_IM, xfer->who,
293 purple_xfer_get_account(xfer)); 293 purple_xfer_get_account(xfer));
294 294
295 if (conv == NULL) 295 if (conv == NULL)
296 return; 296 return;
297 297
922 g_free(filename); 922 g_free(filename);
923 } 923 }
924 else 924 else
925 msg = g_strdup(_("File transfer complete")); 925 msg = g_strdup(_("File transfer complete"));
926 926
927 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, xfer->who, 927 conv = purple_conversations_find_with_account(PURPLE_CONV_TYPE_IM, xfer->who,
928 purple_xfer_get_account(xfer)); 928 purple_xfer_get_account(xfer));
929 929
930 if (conv != NULL) 930 if (conv != NULL)
931 purple_conversation_write(conv, NULL, msg, PURPLE_MESSAGE_SYSTEM, time(NULL)); 931 purple_conversation_write(conv, NULL, msg, PURPLE_MESSAGE_SYSTEM, time(NULL));
932 g_free(msg); 932 g_free(msg);

mercurial