Mercurial > pidgin.yaz

changeset 6719:3cc4d5e55a69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7246] Screennames in buddy pounces are now normalized before comparison. This fixes issues such as screennames with spaces in them. Thanks SimGuy. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Wed, 03 Sep 2003 04:49:24 +0000
parents 37af5dea14d1
children 41120df7ed94
files src/pounce.c
diffstat 1 files changed, 27 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/pounce.c	Wed Sep 03 03:21:27 2003 +0000
+++ b/src/pounce.c	Wed Sep 03 04:49:24 2003 +0000
@@ -365,22 +365,28 @@
 	GaimPounce *pounce;
 	GaimPounceHandler *handler;
 	GList *l, *l_next;
+	char *norm_pouncee;
 
 	g_return_if_fail(pouncer != NULL);
 	g_return_if_fail(pouncee != NULL);
 	g_return_if_fail(events  != GAIM_POUNCE_NONE);
 
-	for (l = gaim_pounces_get_all(); l != NULL; l = l_next) {
+	norm_pouncee = g_strdup(normalize(pouncee));
+
+	for (l = gaim_pounces_get_all(); l != NULL; l = l_next)
+	{
 		pounce = (GaimPounce *)l->data;
 		l_next = l->next;
 
 		if ((gaim_pounce_get_events(pounce) & events) &&
 			(gaim_pounce_get_pouncer(pounce) == pouncer) &&
-			!gaim_utf8_strcasecmp(gaim_pounce_get_pouncee(pounce), pouncee)) {
-
+			!gaim_utf8_strcasecmp(normalize(gaim_pounce_get_pouncee(pounce)),
+								  norm_pouncee))
+		{
 			handler = g_hash_table_lookup(pounce_handlers, pounce->ui_type);
 
-			if (handler != NULL && handler->cb != NULL) {
+			if (handler != NULL && handler->cb != NULL)
+			{
 				handler->cb(pounce, events, gaim_pounce_get_data(pounce));
 
 				if (!gaim_pounce_get_save(pounce))
@@ -388,31 +394,42 @@
 			}
 		}
 	}
+
+	g_free(norm_pouncee);
 }
 
 GaimPounce *
 gaim_find_pounce(const GaimAccount *pouncer, const char *pouncee,
 				 GaimPounceEvent events)
 {
-	GaimPounce *pounce;
+	GaimPounce *pounce = NULL;
 	GList *l;
+	char *norm_pouncee;
 
 	g_return_val_if_fail(pouncer != NULL, NULL);
 	g_return_val_if_fail(pouncee != NULL, NULL);
 	g_return_val_if_fail(events  != GAIM_POUNCE_NONE, NULL);
 
-	for (l = gaim_pounces_get_all(); l != NULL; l = l->next) {
+	norm_pouncee = g_strdup(pouncee);
+
+	for (l = gaim_pounces_get_all(); l != NULL; l = l->next)
+	{
 		pounce = (GaimPounce *)l->data;
 
 		if ((gaim_pounce_get_events(pounce) & events) &&
 			(gaim_pounce_get_pouncer(pounce) == pouncer) &&
-			!gaim_utf8_strcasecmp(gaim_pounce_get_pouncee(pounce), pouncee)) {
+			!gaim_utf8_strcasecmp(normalize(gaim_pounce_get_pouncee(pounce)),
+								  norm_pouncee))
+		{
+			break;
+		}
 
-			return pounce;
-		}
+		pounce = NULL;
 	}
 
-	return NULL;
+	g_free(norm_pouncee);
+
+	return pounce;
 }
 
 /* XML Stuff */