Mercurial > pidgin.yaz
changeset 27922:d8a57dddb780
propagate from branch 'im.pidgin.pidgin' (head 42f77b0e8b8ebf5ff3c30d8f8022ac5d289631e8)
to branch 'im.pidgin.pidgin.yaz' (head 19c48bfdc322b0e16e973ccceae307101101d9e6)
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Thu, 15 Jan 2009 11:44:06 +0000 |
| parents | 53e01bb40cff (current diff) 8a5c0c5c71f9 (diff) |
| children | 2f50e850f4ab |
| files | libpurple/protocols/oscar/odc.c libpurple/protocols/oscar/oscar.c |
| diffstat | 5 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/gg/gg.h Wed Jan 14 06:23:46 2009 +0000 +++ b/libpurple/protocols/gg/gg.h Thu Jan 15 11:44:06 2009 +0000 @@ -61,10 +61,7 @@ GGPToken *token; GList *chats; GGPSearches *searches; - - uin_t tmp_buddy; int chats_count; - GList *pending_richtext_messages; GHashTable *pending_images; } GGPInfo;
--- a/libpurple/protocols/msn/slplink.c Wed Jan 14 06:23:46 2009 +0000 +++ b/libpurple/protocols/msn/slplink.c Thu Jan 15 11:44:06 2009 +0000 @@ -398,6 +398,8 @@ void msn_slplink_queue_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg) { + g_return_if_fail(slpmsg != NULL); + slpmsg->id = slplink->slp_seq_id++; g_queue_push_tail(slplink->slp_msg_queue, slpmsg);
--- a/libpurple/protocols/oscar/odc.c Wed Jan 14 06:23:46 2009 +0000 +++ b/libpurple/protocols/oscar/odc.c Thu Jan 15 11:44:06 2009 +0000 @@ -400,7 +400,7 @@ } } - /* Send the message */ + /* Display the message we received */ imflags = 0; if (images != NULL) imflags |= PURPLE_MESSAGE_IMAGES;
--- a/libpurple/protocols/oscar/oscar.c Wed Jan 14 06:23:46 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Thu Jan 15 11:44:06 2009 +0000 @@ -4364,8 +4364,7 @@ } g_string_free(data, TRUE); - peer_odc_send_im(conn, msg->str, msg->len, charset, - imflags & PURPLE_MESSAGE_AUTO_RESP); + peer_odc_send_im(conn, msg->str, msg->len, charset, imflags); g_string_free(msg, TRUE); }
--- a/pidgin/pidgintooltip.c Wed Jan 14 06:23:46 2009 +0000 +++ b/pidgin/pidgintooltip.c Thu Jan 15 11:44:06 2009 +0000 @@ -82,7 +82,8 @@ static void destroy_tooltip_data(PidginTooltipData *data) { - gtk_tree_path_free(data->common.treeview.path); + if (data->common.treeview.path) + gtk_tree_path_free(data->common.treeview.path); pidgin_tooltip_destroy(); g_free(data); } @@ -380,7 +381,7 @@ g_signal_connect(G_OBJECT(widget), "motion-notify-event", G_CALLBACK(widget_motion_cb), wdata); g_signal_connect(G_OBJECT(widget), "leave-notify-event", G_CALLBACK(widget_leave_cb), NULL); - g_signal_connect_swapped(G_OBJECT(widget), "destroy", G_CALLBACK(g_free), wdata); + g_signal_connect_swapped(G_OBJECT(widget), "destroy", G_CALLBACK(destroy_tooltip_data), wdata); return TRUE; }