# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1205371491 0
# Node ID 0daeabc1a1859bf18921356feb3cfabc2f8da17c
# Parent  dc599fcdac8d07275e6079eac84f91ee133c538f# Parent  22fce0be8ed02f49d94d5d4e09faa244df810d01
merge of '1a03b83dbe8f941cb6de4ed3659bf7b2335d642d'
     and 'bda22ced802132e741a614cf3e67a599e9b08b0c'

diff -r dc599fcdac8d -r 0daeabc1a185 libpurple/plugins/joinpart.c
--- a/libpurple/plugins/joinpart.c	Thu Mar 13 01:23:00 2008 +0000
+++ b/libpurple/plugins/joinpart.c	Thu Mar 13 01:24:51 2008 +0000
@@ -77,7 +77,7 @@
 {
 	PurpleConvChat *chat;
 	int threshold;
-	struct joinpart_key *key;
+	struct joinpart_key key;
 	time_t *last_said;
 
 	g_return_val_if_fail(conv != NULL, FALSE);
@@ -94,10 +94,9 @@
 		return FALSE;
 
 	/* Only show the notice if the user has spoken recently. */
-	key = g_new(struct joinpart_key, 1);
-	key->conv = conv;
-	key->user = g_strdup(name);
-	last_said = g_hash_table_lookup(users, key);
+	key.conv = conv;
+	key.user = (gchar *)name;
+	last_said = g_hash_table_lookup(users, &key);
 	if (last_said != NULL)
 	{
 		int delay = purple_prefs_get_int(DELAY_PREF);