# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1198955996 0
# Node ID bdc83265931411ea95be5e277fe1fc3a3d9031c7
# Parent  d1f282dbbda1147f8ab7463d1b12c812b0be5482# Parent  61b6e842a5bd1c52a177488fcb1d7457302a5cf3
merge of '136abe99803d125464bb1268eb7041051ad4c9ae'
     and '65d6e329e8a42db36f462a47c3e8664cb6a93dec'

diff -r 61b6e842a5bd -r bdc832659314 COPYRIGHT
--- a/COPYRIGHT	Sat Dec 29 17:40:44 2007 +0000
+++ b/COPYRIGHT	Sat Dec 29 19:19:56 2007 +0000
@@ -298,6 +298,7 @@
 Jory A. Pratt
 Brent Priddy
 Justin Pryzby
+Ignacio Casal Quinteiro
 Federicco Mena Quintero
 Yosef Radchenko
 David Raeman
@@ -414,6 +415,7 @@
 Zsombor Welker
 Andrew Wellington
 Adam Wendt
+Simon Wenner
 Dave West
 Zac West
 Daniel Westermann-Clark
diff -r 61b6e842a5bd -r bdc832659314 libpurple/conversation.h
--- a/libpurple/conversation.h	Sat Dec 29 17:40:44 2007 +0000
+++ b/libpurple/conversation.h	Sat Dec 29 19:19:56 2007 +0000
@@ -490,7 +490,8 @@
  *
  * @param conv The conversation.
  *
- * @return The conversation's name.
+ * @return The conversation's name. If the conversation is an IM with a PurpleBuddy,
+ *         then it's the name of the PurpleBuddy.
  */
 const char *purple_conversation_get_name(const PurpleConversation *conv);
 
@@ -718,7 +719,7 @@
  *
  * @param msg   A PurpleConvMessage
  *
- * @return   The name of the sender of the message
+ * @return   The message flags
  *
  * @since 2.2.0
  */
@@ -729,7 +730,7 @@
  *
  * @param msg   A PurpleConvMessage
  *
- * @return   The name of the sender of the message
+ * @return   The timestamp of the message
  *
  * @since 2.2.0
  */
diff -r 61b6e842a5bd -r bdc832659314 libpurple/xmlnode.c
--- a/libpurple/xmlnode.c	Sat Dec 29 17:40:44 2007 +0000
+++ b/libpurple/xmlnode.c	Sat Dec 29 19:19:56 2007 +0000
@@ -552,6 +552,9 @@
 		g_strdup_printf("<?xml version='1.0' encoding='UTF-8' ?>" NEWLINE_S NEWLINE_S "%s", xml);
 	g_free(xml);
 
+	if (len)
+		*len += sizeof("<?xml version='1.0' encoding='UTF-8' ?>" NEWLINE_S NEWLINE_S) - 1;
+
 	return xml_with_declaration;
 }
 
diff -r 61b6e842a5bd -r bdc832659314 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Sat Dec 29 17:40:44 2007 +0000
+++ b/pidgin/gtkblist.c	Sat Dec 29 19:19:56 2007 +0000
@@ -4853,6 +4853,9 @@
 #endif
 
 	gtk_tooltips_force_window (tooltips);
+#if GTK_CHECK_VERSION(2, 12, 0)
+	gtk_widget_set_name (tooltips->tip_window, "gtk-tooltips");
+#endif
 	gtk_widget_ensure_style (tooltips->tip_window);
 	style = gtk_widget_get_style (tooltips->tip_window);