Mercurial > pidgin

changeset 14106:a82d407d38fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 16740] Fix for CID 97 committer: Tailor Script <tailor@pidgin.im>
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 14 Aug 2006 00:08:15 +0000
parents eaf7f35635bc
children c0ee28af3ca2
files plugins/log_reader.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/log_reader.c	Sun Aug 13 23:30:19 2006 +0000
+++ b/plugins/log_reader.c	Mon Aug 14 00:08:15 2006 +0000
@@ -857,11 +857,10 @@
 				 * friendly name or alias. For this test, "match" is defined as:
 				 * ^(friendly_name|alias)([^a-zA-Z0-9].*)?$
 				 */
-				from_name_matches = from_name != NULL && (
-				                     (gaim_str_has_prefix(from_name, friendly_name) &&
+				from_name_matches = (gaim_str_has_prefix(from_name, friendly_name) &&
 				                      !isalnum(*(from_name + friendly_name_length))) ||
 				                     (gaim_str_has_prefix(from_name, log->account->alias) &&
-				                      !isalnum(*(from_name + alias_length))));
+				                      !isalnum(*(from_name + alias_length)));
 
 				to_name_matches = to_name != NULL && (
 				                   (gaim_str_has_prefix(to_name, friendly_name) &&
@@ -930,10 +929,11 @@
 									!isalnum(*(from_name +
 									friendly_name_length)));
 
-							to_name_matches = (gaim_str_has_prefix(
+							to_name_matches = to_name && (
+									(gaim_str_has_prefix(
 									to_name, buddy->server_alias) &&
 									!isalnum(*(to_name +
-									friendly_name_length)));
+									friendly_name_length))));
 
 							if (from_name_matches) {
 								if (!to_name_matches) {