Mercurial > pidgin
changeset 22968:06acaa3b765a
merge of '2f76f01c0ca7594f3efba9430e8de027252c3fd0'
and '4543673d65f212baabcd1140a9f7394b033db0ec'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Fri, 16 May 2008 03:02:31 +0000 |
| parents | 34259e92ed08 (current diff) e6ec85b3d28f (diff) |
| children | aeb478d076e6 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/prefs.h Fri May 16 02:44:45 2008 +0000 +++ b/libpurple/prefs.h Fri May 16 03:02:31 2008 +0000 @@ -301,7 +301,7 @@ */ GList *purple_prefs_get_path_list(const char *name); -/* +/** * Returns a list of children for a pref * * @param name The parent pref
--- a/libpurple/protocols/jabber/chat.c Fri May 16 02:44:45 2008 +0000 +++ b/libpurple/protocols/jabber/chat.c Fri May 16 03:02:31 2008 +0000 @@ -95,11 +95,10 @@ const char *server) { JabberChat *chat = NULL; - char *room_jid; if(NULL != js->chats) { - room_jid = g_strdup_printf("%s@%s", room, server); + char *room_jid = g_strdup_printf("%s@%s", room, server); chat = g_hash_table_lookup(js->chats, jabber_normalize(NULL, room_jid)); g_free(room_jid);