Mercurial > pidgin.yaz

diff src/protocols/silc/ops.c @ 10246:a66cf83552dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 11386] I changed gaim_find_conversation and gaim_find_conversation_with_account The first parameter is now one of GAIM_CONV_IM, GAIM_CONV_CHAT or GAIM_CONV_ANY. Unfortunately, this changes a bajillion files. Please look over this and make sure I use the correct type everywhere. Especially in Novell and MSN, and somewhat in SILC. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 23 Nov 2004 06:14:15 +0000
parents 4e376556566e
children 114d3ac8ff5a
line wrap: on
line diff
--- a/src/protocols/silc/ops.c	Tue Nov 23 05:53:59 2004 +0000
+++ b/src/protocols/silc/ops.c	Tue Nov 23 06:14:15 2004 +0000
@@ -63,14 +63,14 @@
 		for (l = sg->grps; l; l = l->next)
 			if (((SilcGaimPrvgrp)l->data)->key == key) {
 				prv = l->data;
-				convo = gaim_find_conversation_with_account(prv->channel,
-									    sg->account);
+				convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+										prv->channel, sg->account);
 				break;
 			}
 	}
 	if (!convo)
-		convo = gaim_find_conversation_with_account(channel->channel_name,
-							    sg->account);
+		convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+								channel->channel_name, sg->account);
 	if (!convo)
 		return;
 
@@ -149,7 +149,9 @@
 		return;
 
 	if (sender->nickname)
-		convo = gaim_find_conversation_with_account(sender->nickname, sg->account);
+		/* XXX - Should this be GAIM_CONV_IM? */
+		convo = gaim_find_conversation_with_account(GAIM_CONV_ANY,
+								sender->nickname, sg->account);
 
 	if (flags & SILC_MESSAGE_FLAG_SIGNED &&
 	    gaim_prefs_get_bool("/plugins/prpl/silc/verify_im")) {
@@ -263,8 +265,8 @@
 		if (client_entry == conn->local_entry)
 			break;
 
-		convo = gaim_find_conversation_with_account(channel->channel_name,
-							    sg->account);
+		convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+								channel->channel_name, sg->account);
 		if (!convo)
 			break;
 
@@ -280,8 +282,8 @@
 		client_entry = va_arg(va, SilcClientEntry);
 		channel = va_arg(va, SilcChannelEntry);
 
-		convo = gaim_find_conversation_with_account(channel->channel_name,
-							    sg->account);
+		convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+								channel->channel_name, sg->account);
 		if (!convo)
 			break;
 
@@ -301,8 +303,8 @@
 		/* Remove from all channels */
 		silc_hash_table_list(client_entry->channels, &htl);
 		while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
-			convo = gaim_find_conversation_with_account(chu->channel->channel_name,
-								    sg->account);
+			convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+									chu->channel->channel_name, sg->account);
 			if (!convo)
 				continue;
 			gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo),
@@ -321,8 +323,8 @@
 			tmp = va_arg(va, char *);
 			channel = va_arg(va, SilcChannelEntry);
 
-			convo = gaim_find_conversation_with_account(channel->channel_name,
-					sg->account);
+			convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+									channel->channel_name, sg->account);
 			if (!convo)
 				break;
 
@@ -379,8 +381,8 @@
 		/* Change nick on all channels */
 		silc_hash_table_list(client_entry2->channels, &htl);
 		while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
-			convo = gaim_find_conversation_with_account(chu->channel->channel_name,
-								    sg->account);
+			convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+									chu->channel->channel_name, sg->account);
 			if (!convo)
 				continue;
 			if (gaim_conv_chat_find_user(GAIM_CONV_CHAT(convo), client_entry->nickname))
@@ -403,8 +405,8 @@
 		buffer = va_arg(va, SilcBuffer);
 		channel = va_arg(va, SilcChannelEntry);
 
-		convo = gaim_find_conversation_with_account(channel->channel_name,
-							    sg->account);
+		convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+								channel->channel_name, sg->account);
 		if (!convo)
 			break;
 
@@ -440,8 +442,8 @@
 			client_entry2 = va_arg(va, SilcClientEntry);
 			channel = va_arg(va, SilcChannelEntry);
 
-			convo = gaim_find_conversation_with_account(channel->channel_name,
-					sg->account);
+			convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+									channel->channel_name, sg->account);
 			if (!convo)
 				break;
 
@@ -486,8 +488,8 @@
 		client_entry2 = va_arg(va, SilcClientEntry);
 		channel = va_arg(va, SilcChannelEntry);
 
-		convo = gaim_find_conversation_with_account(channel->channel_name,
-							    sg->account);
+		convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+								channel->channel_name, sg->account);
 		if (!convo)
 			break;
 
@@ -541,8 +543,8 @@
 			/* Remove us from all channels */
 			silc_hash_table_list(client_entry->channels, &htl);
 			while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
-				convo = gaim_find_conversation_with_account(chu->channel->channel_name,
-									    sg->account);
+				convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+										chu->channel->channel_name, sg->account);
 				if (!convo)
 					continue;
 				gaim_conv_chat_write(GAIM_CONV_CHAT(convo), client_entry->nickname,
@@ -572,8 +574,8 @@
 			/* Remove user from all channels */
 			silc_hash_table_list(client_entry->channels, &htl);
 			while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
-				convo = gaim_find_conversation_with_account(chu->channel->channel_name,
-									    sg->account);
+				convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+										chu->channel->channel_name, sg->account);
 				if (!convo)
 					continue;
 				gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo),
@@ -605,8 +607,8 @@
 				silc_hash_table_list(clients[i]->channels, &htl);
 				while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
 					convo =
-						gaim_find_conversation_with_account(chu->channel->channel_name,
-										    sg->account);
+						gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+											chu->channel->channel_name, sg->account);
 					if (!convo)
 						continue;
 					gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo),
@@ -1172,20 +1174,14 @@
 
 			channel = va_arg(vp, SilcChannelEntry);
 
-			convo = gaim_find_conversation_with_account(channel->channel_name,
-								    sg->account);
+			convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+									channel->channel_name, sg->account);
 			if (!convo) {
 				gaim_debug_error("silc", "Got a topic for %s, which doesn't exist\n",
 								 channel->channel_name);
 				break;
 			}
 
-			if (gaim_conversation_get_type(convo) != GAIM_CONV_CHAT) {
-				gaim_debug_error("silc", "Got a topic for %s, which isn't a chat\n",
-								 channel->channel_name);
-				break;
-			}
-
 			/* Set topic */
 			if (channel->topic)
 				gaim_conv_chat_set_topic(GAIM_CONV_CHAT(convo), NULL, channel->topic);
@@ -1213,9 +1209,9 @@
 			/* Change nick on all channels */
 			silc_hash_table_list(local_entry->channels, &htl);
 			while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
-				convo = gaim_find_conversation_with_account(chu->channel->channel_name,
-						sg->account);
-				if (!convo || (gaim_conversation_get_type(convo) != GAIM_CONV_CHAT))
+				convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+									chu->channel->channel_name, sg->account);
+				if (!convo)
 					continue;
 				oldnick = gaim_conv_chat_get_nick(GAIM_CONV_CHAT(convo));
 				if (strcmp(oldnick, local_entry->nickname)) {