# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1210906951 0
# Node ID 06acaa3b765aeb77afae029dcd1cea4e8a94e6a9
# Parent  34259e92ed0861d0458bac2f3e336f82cf30c2c3# Parent  e6ec85b3d28f87bb5267089e50d2ef765c8a5c6d
merge of '2f76f01c0ca7594f3efba9430e8de027252c3fd0'
     and '4543673d65f212baabcd1140a9f7394b033db0ec'

diff -r 34259e92ed08 -r 06acaa3b765a libpurple/prefs.h
--- 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
diff -r 34259e92ed08 -r 06acaa3b765a libpurple/protocols/jabber/chat.c
--- 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);