Mercurial > pidgin3 / file diff

--- a/src/protocols/yahoo/yahoochat.c	Mon Jan 23 01:27:40 2006 +0000
+++ b/src/protocols/yahoo/yahoochat.c	Mon Jan 23 01:47:56 2006 +0000
@@ -154,7 +154,8 @@
 	if (members) {
 		g_hash_table_replace(components, g_strdup("members"), g_strdup(members->str));
 	}
-	if (!yahoo_privacy_check(gc, who)) {
+	if (!yahoo_privacy_check(gc, who) || 
+		(gaim_account_get_bool(gaim_connection_get_account(gc), "ignore_invites", FALSE))) {
 		gaim_debug_info("yahoo",
 		    "Invite to conference %s from %s has been dropped.\n", room, who);
 		g_string_free(members, TRUE);
@@ -601,7 +602,8 @@
 
 		components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 		g_hash_table_replace(components, g_strdup("room"), g_strdup(room));
-		if (!yahoo_privacy_check(gc, who)) {
+		if (!yahoo_privacy_check(gc, who) ||
+			(gaim_account_get_bool(gaim_connection_get_account(gc), "ignore_invites", FALSE))) {
 			gaim_debug_info("yahoo",
 			"Invite to room %s from %s has been dropped.\n", room, who);
 			if (room != NULL)