Mercurial > pidgin.yaz

diff src/protocols/irc/msgs.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 c66da6503db8
children 1a97d5e88d12
line wrap: on
line diff
--- a/src/protocols/irc/msgs.c	Tue Nov 23 05:53:59 2004 +0000
+++ b/src/protocols/irc/msgs.c	Tue Nov 23 06:14:15 2004 +0000
@@ -118,7 +118,7 @@
 	if (!args || !args[1] || !args[2])
 		return;
 
-	convo = gaim_find_conversation_with_account(args[1], irc->account);
+	convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, args[1], irc->account);
 	if (!convo)	/* XXX punt on channels we are not in for now */
 		return;
 
@@ -271,7 +271,7 @@
 		topic = irc_mirc2txt (args[2]);
 	}
 
-	convo = gaim_find_conversation_with_account(chan, irc->account);
+	convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, chan, irc->account);
 	if (!convo) {
 		gaim_debug(GAIM_DEBUG_ERROR, "irc", "Got a topic for %s, which doesn't exist\n", chan);
 	}
@@ -316,7 +316,7 @@
 	GaimConversation *convo;
 
 	if (!strcmp(name, "366")) {
-		convo = gaim_find_conversation_with_account(irc->nameconv ? irc->nameconv : args[1], irc->account);
+		convo = gaim_find_conversation_with_account(GAIM_CONV_ANY, irc->nameconv ? irc->nameconv : args[1], irc->account);
 		if (!convo) {
 			gaim_debug(GAIM_DEBUG_ERROR, "irc", "Got a NAMES list for %s, which doesn't exist\n", args[2]);
 			g_string_free(irc->names, TRUE);
@@ -431,7 +431,7 @@
 	GaimConnection *gc;
 	GaimConversation *convo;
 
-	convo = gaim_find_conversation_with_account(args[1], irc->account);
+	convo = gaim_find_conversation_with_account(GAIM_CONV_ANY, args[1], irc->account);
 	if (convo) {
 		if (gaim_conversation_get_type(convo) == GAIM_CONV_CHAT) /* does this happen? */
 			gaim_conv_chat_write(GAIM_CONV_CHAT(convo), args[1], _("no such channel"),
@@ -456,7 +456,7 @@
 	GaimConnection *gc;
 	GaimConversation *convo;
 
-	convo = gaim_find_conversation_with_account(args[1], irc->account);
+	convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, args[1], irc->account);
 	if (convo) {
 		gaim_conv_chat_write(GAIM_CONV_CHAT(convo), args[1], args[2], GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
 	} else {
@@ -468,7 +468,7 @@
 
 void irc_msg_notinchan(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
-	GaimConversation *convo = gaim_find_conversation_with_account(args[1], irc->account);
+	GaimConversation *convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, args[1], irc->account);
 
 	gaim_debug(GAIM_DEBUG_INFO, "irc", "We're apparently not in %s, but tried to use it\n", args[1]);
 	if (convo) {
@@ -485,7 +485,7 @@
 	if (!args || !args[1] || !args[2])
 		return;
 
-	convo = gaim_find_conversation_with_account(args[1], irc->account);
+	convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, args[1], irc->account);
 	if (!convo)
 		return;
 
@@ -583,7 +583,7 @@
 		return;
 	}
 
-	convo = gaim_find_conversation_with_account(args[0], irc->account);
+	convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, args[0], irc->account);
 	if (convo == NULL) {
 		gaim_debug(GAIM_DEBUG_ERROR, "irc", "JOIN for %s failed\n", args[0]);
 		g_free(nick);
@@ -605,7 +605,7 @@
 void irc_msg_kick(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	GaimConnection *gc = gaim_account_get_connection(irc->account);
-	GaimConversation *convo = gaim_find_conversation_with_account(args[0], irc->account);
+	GaimConversation *convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, args[0], irc->account);
 	char *nick = irc_mask_nick(from), *buf;
 
 	if (!gc) {
@@ -640,7 +640,7 @@
 	char *nick = irc_mask_nick(from), *buf;
 
 	if (*args[0] == '#' || *args[0] == '&') {	/* Channel	*/
-		convo = gaim_find_conversation_with_account(args[0], irc->account);
+		convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, args[0], irc->account);
 		if (!convo) {
 			gaim_debug(GAIM_DEBUG_ERROR, "irc", "MODE received for %s, which we are not in\n", args[0]);
 			g_free(nick);
@@ -769,7 +769,7 @@
 	if (!args || !args[0] || !gc)
 		return;
 
-	convo = gaim_find_conversation_with_account(args[0], irc->account);
+	convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, args[0], irc->account);
 	if (!convo) {
 		gaim_debug(GAIM_DEBUG_INFO, "irc", "Got a PART on %s, which doesn't exist -- probably closed\n", args[0]);
 		return;
@@ -822,7 +822,7 @@
 		msg = g_strdup_printf(_("PING reply -- Lag: %lu seconds"), time(NULL) - oldstamp);
 	}
 
-	convo = gaim_find_conversation_with_account(parts[0], irc->account);
+	convo = gaim_find_conversation_with_account(GAIM_CONV_ANY, parts[0], irc->account);
 	g_strfreev(parts);
 	if (convo) {
 		if (gaim_conversation_get_type (convo) == GAIM_CONV_CHAT)
@@ -876,7 +876,7 @@
 	} else if (notice) {
 		serv_got_im(gc, nick, msg, 0, time(NULL));
 	} else {
-		convo = gaim_find_conversation_with_account(args[0], irc->account);
+		convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, args[0], irc->account);
 		if (convo)
 			serv_got_chat_in(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo)), nick, 0, msg, time(NULL));
 		else