changeset 22966:c0a8dbe36ffe

merge of '994f8bdccfcf73a73924e593d2c398c8d416e5e9' and '9d2e66fa6a8265d3cffb16f084ddb39903e0a36c'
author Etan Reisner <pidgin@unreliablesource.net>
date Wed, 14 May 2008 03:32:10 +0000
parents 5a359f6666c2 (current diff) 1003f1736be1 (diff)
children e6ec85b3d28f
files
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/prefs.h	Wed May 14 02:21:25 2008 +0000
+++ b/libpurple/prefs.h	Wed May 14 03:32:10 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	Wed May 14 02:21:25 2008 +0000
+++ b/libpurple/protocols/jabber/chat.c	Wed May 14 03:32:10 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);