# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1232252221 0
# Node ID 6fe309e61bf9923f364059e79cedc10f37006b39
# Parent  8a5c0c5c71f986f833073082fe9de82730da2a3e# Parent  62a5a41c3dfdb655bfed02f6b3853b79b26b37f3
propagate from branch 'im.pidgin.pidgin' (head 42f77b0e8b8ebf5ff3c30d8f8022ac5d289631e8)
            to branch 'im.pidgin.cpw.darkrain42.oscar.ssl' (head b6d4e7d29639f3e23e852fcf68d362275de42902)

diff -r 62a5a41c3dfd -r 6fe309e61bf9 libpurple/protocols/gg/gg.h
--- a/libpurple/protocols/gg/gg.h	Wed Jan 14 06:32:04 2009 +0000
+++ b/libpurple/protocols/gg/gg.h	Sun Jan 18 04:17:01 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;
diff -r 62a5a41c3dfd -r 6fe309e61bf9 libpurple/protocols/msn/slplink.c
--- a/libpurple/protocols/msn/slplink.c	Wed Jan 14 06:32:04 2009 +0000
+++ b/libpurple/protocols/msn/slplink.c	Sun Jan 18 04:17:01 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);
diff -r 62a5a41c3dfd -r 6fe309e61bf9 libpurple/protocols/oscar/odc.c
--- a/libpurple/protocols/oscar/odc.c	Wed Jan 14 06:32:04 2009 +0000
+++ b/libpurple/protocols/oscar/odc.c	Sun Jan 18 04:17:01 2009 +0000
@@ -394,7 +394,7 @@
 		}
 	}
 
-	/* Send the message */
+	/* Display the message we received */
 	imflags = 0;
 	if (images != NULL)
 		imflags |= PURPLE_MESSAGE_IMAGES;
diff -r 62a5a41c3dfd -r 6fe309e61bf9 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Wed Jan 14 06:32:04 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sun Jan 18 04:17:01 2009 +0000
@@ -4496,8 +4496,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);
 }
 
diff -r 62a5a41c3dfd -r 6fe309e61bf9 pidgin/pidgintooltip.c
--- a/pidgin/pidgintooltip.c	Wed Jan 14 06:32:04 2009 +0000
+++ b/pidgin/pidgintooltip.c	Sun Jan 18 04:17:01 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;
 }