comparison libpurple/ft.c @ 31086:a8cc50c2279f

Remove trailing whitespace
author Richard Laager <rlaager@wiktel.com>
date Tue, 04 Jan 2011 06:55:30 +0000
parents a76cf8ecb0c5
children 45496e1dfe5c
comparison
equal deleted inserted replaced
31085:44f53d3fc54f 31086:a8cc50c2279f
272 break; 272 break;
273 } 273 }
274 } 274 }
275 } 275 }
276 276
277 static void 277 static void
278 purple_xfer_conversation_write_internal(PurpleXfer *xfer, 278 purple_xfer_conversation_write_internal(PurpleXfer *xfer,
279 const char *message, gboolean is_error, gboolean print_thumbnail) 279 const char *message, gboolean is_error, gboolean print_thumbnail)
280 { 280 {
281 PurpleConversation *conv = NULL; 281 PurpleConversation *conv = NULL;
282 PurpleMessageFlags flags = PURPLE_MESSAGE_SYSTEM; 282 PurpleMessageFlags flags = PURPLE_MESSAGE_SYSTEM;
300 if (is_error) 300 if (is_error)
301 flags |= PURPLE_MESSAGE_ERROR; 301 flags |= PURPLE_MESSAGE_ERROR;
302 302
303 if (print_thumbnail && thumbnail_data) { 303 if (print_thumbnail && thumbnail_data) {
304 gchar *message_with_img; 304 gchar *message_with_img;
305 gpointer data = g_memdup(thumbnail_data, size); 305 gpointer data = g_memdup(thumbnail_data, size);
306 int id = purple_imgstore_add_with_id(data, size, NULL); 306 int id = purple_imgstore_add_with_id(data, size, NULL);
307 307
308 message_with_img = 308 message_with_img =
309 g_strdup_printf("<img id='%d'> %s", id, escaped); 309 g_strdup_printf("<img id='%d'> %s", id, escaped);
310 purple_conversation_write(conv, NULL, message_with_img, flags, 310 purple_conversation_write(conv, NULL, message_with_img, flags,
311 time(NULL)); 311 time(NULL));
312 purple_imgstore_unref_by_id(id); 312 purple_imgstore_unref_by_id(id);
313 g_free(message_with_img); 313 g_free(message_with_img);
314 } else { 314 } else {
315 purple_conversation_write(conv, NULL, escaped, flags, time(NULL)); 315 purple_conversation_write(conv, NULL, escaped, flags, time(NULL));
528 purple_request_accept_cancel(xfer, NULL, buf, NULL, 528 purple_request_accept_cancel(xfer, NULL, buf, NULL,
529 PURPLE_DEFAULT_ACTION_NONE, xfer->account, xfer->who, NULL, 529 PURPLE_DEFAULT_ACTION_NONE, xfer->account, xfer->who, NULL,
530 xfer, G_CALLBACK(purple_xfer_choose_file), 530 xfer, G_CALLBACK(purple_xfer_choose_file),
531 G_CALLBACK(cancel_recv_cb)); 531 G_CALLBACK(cancel_recv_cb));
532 } 532 }
533 533
534 g_free(buf); 534 g_free(buf);
535 } else 535 } else
536 purple_xfer_choose_file(xfer); 536 purple_xfer_choose_file(xfer);
537 } 537 }
538 538