comparison: pidgin/gtkutils.c
pidgin/gtkutils.c
- branch
- next.minor
- changeset 31396
- 6d3746f00f06
- parent 31321
- 1fef3832cfa2
- parent 31372
- 743be8e50f23
- child 31565
- 1138b2c998ec
equal
deleted
inserted
replaced
| 31325:2bb18e0658e7 | 31396:6d3746f00f06 |
|---|---|
| 1456 char *who; | 1456 char *who; |
| 1457 } _DndData; | 1457 } _DndData; |
| 1458 | 1458 |
| 1459 static void dnd_image_ok_callback(_DndData *data, int choice) | 1459 static void dnd_image_ok_callback(_DndData *data, int choice) |
| 1460 { | 1460 { |
| 1461 const gchar *shortname; | |
| 1461 gchar *filedata; | 1462 gchar *filedata; |
| 1462 size_t size; | 1463 size_t size; |
| 1463 struct stat st; | 1464 struct stat st; |
| 1464 GError *err = NULL; | 1465 GError *err = NULL; |
| 1465 PurpleConversation *conv; | 1466 PurpleConversation *conv; |
| 1510 g_error_free(err); | 1511 g_error_free(err); |
| 1511 g_free(str); | 1512 g_free(str); |
| 1512 | 1513 |
| 1513 break; | 1514 break; |
| 1514 } | 1515 } |
| 1515 id = purple_imgstore_add_with_id(filedata, size, data->filename); | 1516 shortname = strrchr(data->filename, G_DIR_SEPARATOR); |
| 1517 shortname = shortname ? shortname + 1 : data->filename; | |
| 1518 id = purple_imgstore_add_with_id(filedata, size, shortname); | |
| 1516 | 1519 |
| 1517 gtk_text_buffer_get_iter_at_mark(GTK_IMHTML(gtkconv->entry)->text_buffer, &iter, | 1520 gtk_text_buffer_get_iter_at_mark(GTK_IMHTML(gtkconv->entry)->text_buffer, &iter, |
| 1518 gtk_text_buffer_get_insert(GTK_IMHTML(gtkconv->entry)->text_buffer)); | 1521 gtk_text_buffer_get_insert(GTK_IMHTML(gtkconv->entry)->text_buffer)); |
| 1519 gtk_imhtml_insert_image_at_iter(GTK_IMHTML(gtkconv->entry), id, &iter); | 1522 gtk_imhtml_insert_image_at_iter(GTK_IMHTML(gtkconv->entry), id, &iter); |
| 1520 purple_imgstore_unref_by_id(id); | 1523 purple_imgstore_unref_by_id(id); |
