Mercurial > pidgin.yaz

comparison pidgin/gtkutils.c @ 31821:17a4b32f4d46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 8480ab9498b0e22b164f3a40c100f59e2d6dd916) to branch 'im.pidgin.pidgin.next.minor' (head 490036a7b4ce807cb851ded91af7d959fe1c029e)
author Paul Aurich <paul@darkrain42.org>
date Sun, 30 Jan 2011 17:52:06 +0000
parents 917c597beb97 85d5f1e37fdb
children d72d728226dc
comparison
equal deleted inserted replaced
31820:28e27a37e4b4 31821:17a4b32f4d46
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);