comparison src/pounce.c @ 7261:1930e3d00ecd

[gaim-migrate @ 7838] prpl-specific normalize is back, after my crusade to kill it. committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Tue, 14 Oct 2003 05:07:39 +0000
parents d17a587efeb3
children dc88428762c9
comparison
equal deleted inserted replaced
7260:49839c4cbb1c 7261:1930e3d00ecd
370 370
371 g_return_if_fail(pouncer != NULL); 371 g_return_if_fail(pouncer != NULL);
372 g_return_if_fail(pouncee != NULL); 372 g_return_if_fail(pouncee != NULL);
373 g_return_if_fail(events != GAIM_POUNCE_NONE); 373 g_return_if_fail(events != GAIM_POUNCE_NONE);
374 374
375 norm_pouncee = g_strdup(gaim_normalize(pouncee)); 375 norm_pouncee = g_strdup(gaim_normalize(pouncer, pouncee));
376 376
377 for (l = gaim_pounces_get_all(); l != NULL; l = l_next) 377 for (l = gaim_pounces_get_all(); l != NULL; l = l_next)
378 { 378 {
379 pounce = (GaimPounce *)l->data; 379 pounce = (GaimPounce *)l->data;
380 l_next = l->next; 380 l_next = l->next;
381 381
382 if ((gaim_pounce_get_events(pounce) & events) && 382 if ((gaim_pounce_get_events(pounce) & events) &&
383 (gaim_pounce_get_pouncer(pounce) == pouncer) && 383 (gaim_pounce_get_pouncer(pounce) == pouncer) &&
384 !gaim_utf8_strcasecmp(gaim_normalize(gaim_pounce_get_pouncee(pounce)), 384 !gaim_utf8_strcasecmp(gaim_normalize(pouncer, gaim_pounce_get_pouncee(pounce)),
385 norm_pouncee)) 385 norm_pouncee))
386 { 386 {
387 handler = g_hash_table_lookup(pounce_handlers, pounce->ui_type); 387 handler = g_hash_table_lookup(pounce_handlers, pounce->ui_type);
388 388
389 if (handler != NULL && handler->cb != NULL) 389 if (handler != NULL && handler->cb != NULL)
409 409
410 g_return_val_if_fail(pouncer != NULL, NULL); 410 g_return_val_if_fail(pouncer != NULL, NULL);
411 g_return_val_if_fail(pouncee != NULL, NULL); 411 g_return_val_if_fail(pouncee != NULL, NULL);
412 g_return_val_if_fail(events != GAIM_POUNCE_NONE, NULL); 412 g_return_val_if_fail(events != GAIM_POUNCE_NONE, NULL);
413 413
414 norm_pouncee = g_strdup(pouncee); 414 norm_pouncee = g_strdup(gaim_normalize(pouncer, pouncee));
415 415
416 for (l = gaim_pounces_get_all(); l != NULL; l = l->next) 416 for (l = gaim_pounces_get_all(); l != NULL; l = l->next)
417 { 417 {
418 pounce = (GaimPounce *)l->data; 418 pounce = (GaimPounce *)l->data;
419 419
420 if ((gaim_pounce_get_events(pounce) & events) && 420 if ((gaim_pounce_get_events(pounce) & events) &&
421 (gaim_pounce_get_pouncer(pounce) == pouncer) && 421 (gaim_pounce_get_pouncer(pounce) == pouncer) &&
422 !gaim_utf8_strcasecmp(gaim_normalize(gaim_pounce_get_pouncee(pounce)), 422 !gaim_utf8_strcasecmp(gaim_normalize(pouncer, gaim_pounce_get_pouncee(pounce)),
423 norm_pouncee)) 423 norm_pouncee))
424 { 424 {
425 break; 425 break;
426 } 426 }
427 427