changeset 8186:8efff3aa4e39

[gaim-migrate @ 8907] marv doesn't like missed parts committer: Tailor Script <tailor@pidgin.im>
author Ethan Blanton <elb@pidgin.im>
date Fri, 30 Jan 2004 23:09:17 +0000
parents 3a229ad2fab0
children 32e68ef6d668
files ChangeLog src/protocols/irc/msgs.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jan 30 21:56:31 2004 +0000
+++ b/ChangeLog	Fri Jan 30 23:09:17 2004 +0000
@@ -7,6 +7,7 @@
 	  accessibility tools (Marc Mulcahy)
 	* Improved accessibility in conversation windows (Nathan Fredrickson)
 	* Keyboard access to context menus via Shift+F10 (Marc Mulcahy)
+        * Yet Another IRC channel user duplication bugfix (Tim Ringenbach)
 	* TCL Plugin API changed
 	* Tabs now stay green when they are supposed to (Etan Reisner)
 	* Offline accounts in account drop-down lists are now greyed (Etan Reisner)
--- a/src/protocols/irc/msgs.c	Fri Jan 30 21:56:31 2004 +0000
+++ b/src/protocols/irc/msgs.c	Fri Jan 30 23:09:17 2004 +0000
@@ -708,7 +708,7 @@
 	GaimConversation *convo;
 	char *nick, *msg;
 
-	if (!args || !args[0] || !args[1] || !gc)
+	if (!args || !args[0] || !gc)
 		return;
 
 	convo = gaim_find_conversation_with_account(args[0], irc->account);
@@ -719,7 +719,8 @@
 
 	nick = irc_mask_nick(from);
 	if (!gaim_utf8_strcasecmp(nick, gaim_connection_get_display_name(gc))) {
-		msg = g_strdup_printf(_("You have parted the channel%s%s"), *args[1] ? ": " : "", args[1]);
+		msg = g_strdup_printf(_("You have parted the channel%s%s"),
+                                      (args[1] && *args[1]) ? ": " : "", args[1]);
 		gaim_conv_chat_write(GAIM_CONV_CHAT(convo), args[0], msg, GAIM_MESSAGE_SYSTEM, time(NULL));
 		g_free(msg);
 	} else {