pidgin: libpurple/conversation.c comparison

comparison libpurple/conversation.c @ 31702:47c604efed32

propagate from branch 'im.pidgin.pidgin.2.9.0' (head d3dccc0843de29ce8d5c7e2e017028396dc2b46b) to branch 'im.pidgin.pidgin' (head cfa2120bb1d7c408937f3075c018fb10c1e6eefa)

author	Ethan Blanton <elb@pidgin.im>
date	Fri, 24 Jun 2011 16:44:06 +0000
parents	5ffd5582f5fe
children

comparison

equal deleted inserted replaced

-:6e5d46ea82f9
+:47c604efed32
 {
 	g_free(hc->name);
 	g_free(hc);
 }
+static guint _purple_conversation_user_hash(gconstpointer data)
+{
+	const gchar *name = data;
+	gchar *collated;
+	guint hash;
+	collated = g_utf8_collate_key(name, -1);
+	hash     = g_str_hash(collated);
+	g_free(collated);
+	return hash;
+}
+static gboolean _purple_conversation_user_equal(gconstpointer a, gconstpointer b)
+{
+	return !g_utf8_collate(a, b);
+}
 void
 purple_conversations_set_ui_ops(PurpleConversationUiOps *ops)
 {
 	default_ops = ops;
 }
 	{
 		const char *disp;
 		conv->u.chat = g_new0(PurpleConvChat, 1);
 		conv->u.chat->conv = conv;
+		conv->u.chat->users = g_hash_table_new_full(_purple_conversation_user_hash,
+				_purple_conversation_user_equal, g_free, NULL);
 		PURPLE_DBUS_REGISTER_POINTER(conv->u.chat, PurpleConvChat);
 		chats = g_list_prepend(chats, conv);
 		if ((disp = purple_connection_get_display_name(account->gc)))
 		PURPLE_DBUS_UNREGISTER_POINTER(conv->u.im);
 		g_free(conv->u.im);
 		conv->u.im = NULL;
 	}
 	else if (conv->type == PURPLE_CONV_TYPE_CHAT) {
+		g_hash_table_destroy(conv->u.chat->users);
+		conv->u.chat->users = NULL;
 		g_list_foreach(conv->u.chat->in_room, (GFunc)purple_conv_chat_cb_destroy, NULL);
 		g_list_free(conv->u.chat->in_room);
 		g_list_foreach(conv->u.chat->ignored, (GFunc)g_free, NULL);
 						 "chat-buddy-joining", conv, user, flag)) ||
 				purple_conv_chat_is_user_ignored(chat, user);
 		cbuddy = purple_conv_chat_cb_new(user, alias, flag);
 		cbuddy->buddy = purple_find_buddy(conv->account, user) != NULL;
-		/* This seems dumb. Why should we set users thousands of times? */
-		purple_conv_chat_set_users(chat,
+		chat->in_room = g_list_prepend(chat->in_room, cbuddy);
-				g_list_prepend(chat->in_room, cbuddy));
+		g_hash_table_replace(chat->users, g_strdup(cbuddy->name), cbuddy);
 		cbuddies = g_list_prepend(cbuddies, cbuddy);
 		if (!quiet && new_arrivals) {
 			char *alias_esc = g_markup_escape_text(alias, -1);
 	}
 	flags = purple_conv_chat_user_get_flags(chat, old_user);
 	cb = purple_conv_chat_cb_new(new_user, new_alias, flags);
 	cb->buddy = purple_find_buddy(conv->account, new_user) != NULL;
-	purple_conv_chat_set_users(chat,
-		g_list_prepend(chat->in_room, cb));
+	chat->in_room = g_list_prepend(chat->in_room, cb);
+	g_hash_table_replace(chat->users, g_strdup(cb->name), cb);
 	if (ops != NULL && ops->chat_rename_user != NULL)
 		ops->chat_rename_user(conv, old_user, new_user, new_alias);
 	cb = purple_conv_chat_cb_find(chat, old_user);
 	if (cb) {
-		purple_conv_chat_set_users(chat,
+		chat->in_room = g_list_remove(chat->in_room, cb);
-				g_list_remove(chat->in_room, cb));
+		g_hash_table_remove(chat->users, cb->name);
 		purple_conv_chat_cb_destroy(cb);
 	}
 	if (purple_conv_chat_is_user_ignored(chat, old_user)) {
 		purple_conv_chat_unignore(chat, old_user);
 				purple_conv_chat_is_user_ignored(chat, user);
 		cb = purple_conv_chat_cb_find(chat, user);
 		if (cb) {
-			purple_conv_chat_set_users(chat,
+			chat->in_room = g_list_remove(chat->in_room, cb);
-					g_list_remove(chat->in_room, cb));
+			g_hash_table_remove(chat->users, cb->name);
 			purple_conv_chat_cb_destroy(cb);
 		}
 		/* NOTE: Don't remove them from ignored in case they re-enter. */
 						 "chat-buddy-left", conv, cb->name, NULL);
 		purple_conv_chat_cb_destroy(cb);
 	}
+	g_hash_table_remove_all(chat->users);
+	chat->users = NULL;
 	g_list_free(users);
-	purple_conv_chat_set_users(chat, NULL);
+	chat->in_room = NULL;
 }
 gboolean
 purple_conv_chat_find_user(PurpleConvChat *chat, const char *user)
 }
 PurpleConvChatBuddy *
 purple_conv_chat_cb_find(PurpleConvChat *chat, const char *name)
 {
-	GList *l;
-	PurpleConvChatBuddy *cb = NULL;
 	g_return_val_if_fail(chat != NULL, NULL);
 	g_return_val_if_fail(name != NULL, NULL);
-	for (l = purple_conv_chat_get_users(chat); l; l = l->next) {
+	return g_hash_table_lookup(chat->users, name);
-		cb = l->data;
-		if (!g_utf8_collate(cb->name, name))
-			return cb;
-	}
-	return NULL;
 }
 void
 purple_conv_chat_cb_destroy(PurpleConvChatBuddy *cb)
 {
 	if (cb == NULL)
 		return;
+	purple_signal_emit(purple_conversations_get_handle(),
+			"deleting-chat-buddy", cb);
 	g_free(cb->alias);
 	g_free(cb->alias_key);
 	g_free(cb->name);
 	g_hash_table_destroy(cb->attributes);
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
 										PURPLE_SUBTYPE_CONVERSATION),
 						 purple_value_new(PURPLE_TYPE_STRING),
 						 purple_value_new(PURPLE_TYPE_STRING));
+	purple_signal_register(handle, "deleting-chat-buddy",
+						 purple_marshal_VOID__POINTER, NULL, 1,
+						 purple_value_new(PURPLE_TYPE_SUBTYPE,
+										PURPLE_SUBTYPE_CHATBUDDY));
 	purple_signal_register(handle, "chat-inviting-user",
 						 purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3,
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
 										PURPLE_SUBTYPE_CONVERSATION),
 						 purple_value_new(PURPLE_TYPE_STRING),

Mercurial > pidgin

comparison libpurple/conversation.c @ 31702:47c604efed32