Mercurial > pidgin.yaz
changeset 9673:906949cd7a1e
[gaim-migrate @ 10525]
datallah here is cleaning up his mistakes
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Thu, 05 Aug 2004 14:55:58 +0000 |
parents | 12d0822a3983 |
children | a049733e41f3 |
files | src/gtkblist.c src/gtkconv.c |
diffstat | 2 files changed, 19 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkblist.c Thu Aug 05 14:23:56 2004 +0000 +++ b/src/gtkblist.c Thu Aug 05 14:55:58 2004 +0000 @@ -2014,15 +2014,15 @@ GaimBuddy *b = GAIM_BLIST_NODE_IS_BUDDY(node) ? (GaimBuddy*)node : gaim_contact_get_priority_buddy((GaimContact*)node); GList *tmp; GList *files = gaim_uri_list_extract_filenames(sd->data); - for(tmp = files; tmp != NULL ; tmp = g_list_next(tmp)) { - gchar *filename = tmp->data; + for(tmp = files; tmp != NULL ; tmp = g_list_next(tmp)) { + gchar *filename = tmp->data; /* XXX - Make ft API support creating a transfer with more than one file */ if (g_file_test(filename, G_FILE_TEST_EXISTS) && !g_file_test(filename, G_FILE_TEST_IS_DIR)) { serv_send_file(gaim_account_get_connection(b->account), b->name, filename); } g_free(filename); - } + } g_list_free(files); } }
--- a/src/gtkconv.c Thu Aug 05 14:23:56 2004 +0000 +++ b/src/gtkconv.c Thu Aug 05 14:55:58 2004 +0000 @@ -4418,27 +4418,23 @@ gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t); } else if (sd->target == gdk_atom_intern("text/uri-list", FALSE)) { - if (!g_ascii_strncasecmp(sd->data, "file://", 7)) { - GError *converr = NULL; - GList *tmp; - GList *files = gaim_uri_list_extract_filenames(sd->data); - for(tmp = files; tmp != NULL ; tmp = g_list_next(tmp)) { - gchar *filename = tmp->data; - /* XXX - Make ft API support creating a transfer with more than one file */ - if (g_file_test(filename, G_FILE_TEST_EXISTS) - && !g_file_test(filename, G_FILE_TEST_IS_DIR) - && gaim_conversation_get_type(conv) == GAIM_CONV_IM) { - serv_send_file(gaim_conversation_get_gc(conv), gaim_conversation_get_name(conv), filename); - } - g_free(filename); - } - g_list_free(files); - gchar *file; - /* XXX - Attempt to load this file into gdk_pixbuf, or otherwise determine if it is an image. If it is, offer - * the choice of a) sending this file b) inserting this file as an IM image or c) setting this file as a custom - * buddy icon for this buddy */ - g_free(file); + GList *tmp; + GList *files = gaim_uri_list_extract_filenames(sd->data); + for(tmp = files; tmp != NULL ; tmp = g_list_next(tmp)) { + gchar *filename = tmp->data; + /* XXX - Make ft API support creating a transfer with more than one file */ + if (g_file_test(filename, G_FILE_TEST_EXISTS) + && !g_file_test(filename, G_FILE_TEST_IS_DIR) + && gaim_conversation_get_type(conv) == GAIM_CONV_IM) { + serv_send_file(gaim_conversation_get_gc(conv), + gaim_conversation_get_name(conv), filename); + } + g_free(filename); } + g_list_free(files); + /* XXX - Attempt to load this file into gdk_pixbuf, or otherwise determine if it is an image. If it is, offer + * the choice of a) sending this file b) inserting this file as an IM image or c) setting this file as a custom + * buddy icon for this buddy */ } gtk_drag_finish(dc, FALSE, FALSE, t); }