Mercurial > pidgin.yaz
changeset 22928:4fa01df51fec
merge of '657be692e8fe314ef25624dc2b70d25e1cf8085b'
and 'f34420097faff83cee26133ba8bd05198e56db0a'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Tue, 13 May 2008 18:56:11 +0000 |
| parents | 4007d1a39da5 (current diff) 7c8275692b3b (diff) |
| children | 25e4a0add118 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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); }
--- 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);