# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1210704971 0
# Node ID 4fa01df51fecffd6db7a5093f6250b0175e4054a
# Parent  4007d1a39da5f92d866e321039402d61bebd73c1# Parent  7c8275692b3b170c18525a60f808c1c8a45ae11d
merge of '657be692e8fe314ef25624dc2b70d25e1cf8085b'
     and 'f34420097faff83cee26133ba8bd05198e56db0a'

diff -r 4007d1a39da5 -r 4fa01df51fec finch/gntsound.c
--- a/finch/gntsound.c	Tue May 13 18:55:06 2008 +0000
+++ b/finch/gntsound.c	Tue May 13 18:56:11 2008 +0000
@@ -1028,13 +1028,13 @@
 
 	for (i = 0; i < PURPLE_NUM_SOUNDS; i++) {
 		FinchSoundEvent * event = &sounds[i];
-		
+
 		if (event->label == NULL) {
 			continue;
 		}
 
 		gnt_tree_add_choice(GNT_TREE(tree), GINT_TO_POINTER(i),
-			gnt_tree_create_row(GNT_TREE(tree), "", ""),
+			gnt_tree_create_row(GNT_TREE(tree), event->label, event->def),
 			NULL, NULL);
 	}
 
diff -r 4007d1a39da5 -r 4fa01df51fec pidgin/plugins/history.c
--- a/pidgin/plugins/history.c	Tue May 13 18:55:06 2008 +0000
+++ b/pidgin/plugins/history.c	Tue May 13 18:56:11 2008 +0000
@@ -43,7 +43,7 @@
 	char *header;
 	char *protocol;
 	char *escaped_alias;
-	char *header_date;
+	const char *header_date;
 
 	convtype = purple_conversation_get_type(c);
 	gtkconv = PIDGIN_CONVERSATION(c);