Mercurial > pidgin.yaz
comparison libpurple/protocols/novell/novell.c @ 17094:f6dd1f7689ee
Replace nm_utf8_strcasecmp() with purple_utf8_strcasecmp().
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Mon, 14 May 2007 23:35:28 +0000 |
parents | a338acd14365 |
children | 3e437e86bd6e 44b4e8bd759b ddee7883d9fa 315151da0dc6 |
comparison
equal
deleted
inserted
replaced
17093:4b65a67d23b8 | 17094:f6dd1f7689ee |
---|---|
732 if (ret_code == NM_OK) { | 732 if (ret_code == NM_OK) { |
733 | 733 |
734 if (allowed) { | 734 if (allowed) { |
735 | 735 |
736 if (!g_slist_find_custom(gc->account->permit, | 736 if (!g_slist_find_custom(gc->account->permit, |
737 display_id, (GCompareFunc)nm_utf8_strcasecmp)) { | 737 display_id, (GCompareFunc)purple_utf8_strcasecmp)) { |
738 purple_privacy_permit_add(gc->account, display_id, TRUE); | 738 purple_privacy_permit_add(gc->account, display_id, TRUE); |
739 } | 739 } |
740 | 740 |
741 } else { | 741 } else { |
742 | 742 |
743 if (!g_slist_find_custom(gc->account->permit, | 743 if (!g_slist_find_custom(gc->account->permit, |
744 display_id, (GCompareFunc)nm_utf8_strcasecmp)) { | 744 display_id, (GCompareFunc)purple_utf8_strcasecmp)) { |
745 purple_privacy_deny_add(gc->account, display_id, TRUE); | 745 purple_privacy_deny_add(gc->account, display_id, TRUE); |
746 } | 746 } |
747 } | 747 } |
748 | 748 |
749 } else { | 749 } else { |
780 display_id = nm_user_record_get_display_id(user_record); | 780 display_id = nm_user_record_get_display_id(user_record); |
781 | 781 |
782 if (display_id) { | 782 if (display_id) { |
783 | 783 |
784 if (!g_slist_find_custom(gc->account->deny, | 784 if (!g_slist_find_custom(gc->account->deny, |
785 display_id, (GCompareFunc)nm_utf8_strcasecmp)) { | 785 display_id, (GCompareFunc)purple_utf8_strcasecmp)) { |
786 | 786 |
787 purple_privacy_deny_add(gc->account, display_id, TRUE); | 787 purple_privacy_deny_add(gc->account, display_id, TRUE); |
788 } | 788 } |
789 | 789 |
790 } else { | 790 } else { |
832 | 832 |
833 if (display_id) { | 833 if (display_id) { |
834 | 834 |
835 if (!g_slist_find_custom(gc->account->permit, | 835 if (!g_slist_find_custom(gc->account->permit, |
836 display_id, | 836 display_id, |
837 (GCompareFunc)nm_utf8_strcasecmp)) { | 837 (GCompareFunc)purple_utf8_strcasecmp)) { |
838 | 838 |
839 purple_privacy_permit_add(gc->account, display_id, TRUE); | 839 purple_privacy_permit_add(gc->account, display_id, TRUE); |
840 } | 840 } |
841 | 841 |
842 } else { | 842 } else { |
1410 name = nm_user_record_get_display_id(user_record); | 1410 name = nm_user_record_get_display_id(user_record); |
1411 else | 1411 else |
1412 name =(char *)node->data; | 1412 name =(char *)node->data; |
1413 | 1413 |
1414 if (!g_slist_find_custom(gc->account->permit, | 1414 if (!g_slist_find_custom(gc->account->permit, |
1415 name, (GCompareFunc)nm_utf8_strcasecmp)) { | 1415 name, (GCompareFunc)purple_utf8_strcasecmp)) { |
1416 purple_privacy_permit_add(gc->account, name , TRUE); | 1416 purple_privacy_permit_add(gc->account, name , TRUE); |
1417 } | 1417 } |
1418 } | 1418 } |
1419 | 1419 |
1420 for (node = user->deny_list; node; node = node->next) { | 1420 for (node = user->deny_list; node; node = node->next) { |
1423 name = nm_user_record_get_display_id(user_record); | 1423 name = nm_user_record_get_display_id(user_record); |
1424 else | 1424 else |
1425 name =(char *)node->data; | 1425 name =(char *)node->data; |
1426 | 1426 |
1427 if (!g_slist_find_custom(gc->account->deny, | 1427 if (!g_slist_find_custom(gc->account->deny, |
1428 name, (GCompareFunc)nm_utf8_strcasecmp)) { | 1428 name, (GCompareFunc)purple_utf8_strcasecmp)) { |
1429 purple_privacy_deny_add(gc->account, name, TRUE); | 1429 purple_privacy_deny_add(gc->account, name, TRUE); |
1430 } | 1430 } |
1431 } | 1431 } |
1432 | 1432 |
1433 | 1433 |
1434 /* Remove stuff */ | 1434 /* Remove stuff */ |
1435 for (node = gc->account->permit; node; node = node->next) { | 1435 for (node = gc->account->permit; node; node = node->next) { |
1436 dn = nm_lookup_dn(user, (char *)node->data); | 1436 dn = nm_lookup_dn(user, (char *)node->data); |
1437 if (dn != NULL && | 1437 if (dn != NULL && |
1438 !g_slist_find_custom(user->allow_list, | 1438 !g_slist_find_custom(user->allow_list, |
1439 dn, (GCompareFunc)nm_utf8_strcasecmp)) { | 1439 dn, (GCompareFunc)purple_utf8_strcasecmp)) { |
1440 rem_list = g_slist_append(rem_list, node->data); | 1440 rem_list = g_slist_append(rem_list, node->data); |
1441 } | 1441 } |
1442 } | 1442 } |
1443 | 1443 |
1444 if (rem_list) { | 1444 if (rem_list) { |
1451 | 1451 |
1452 for (node = gc->account->deny; node; node = node->next) { | 1452 for (node = gc->account->deny; node; node = node->next) { |
1453 dn = nm_lookup_dn(user, (char *)node->data); | 1453 dn = nm_lookup_dn(user, (char *)node->data); |
1454 if (dn != NULL && | 1454 if (dn != NULL && |
1455 !g_slist_find_custom(user->deny_list, | 1455 !g_slist_find_custom(user->deny_list, |
1456 dn, (GCompareFunc)nm_utf8_strcasecmp)) { | 1456 dn, (GCompareFunc)purple_utf8_strcasecmp)) { |
1457 rem_list = g_slist_append(rem_list, node->data); | 1457 rem_list = g_slist_append(rem_list, node->data); |
1458 } | 1458 } |
1459 } | 1459 } |
1460 | 1460 |
1461 if (rem_list) { | 1461 if (rem_list) { |
3266 user_record = nm_find_user_record(user, (char *)node->data); | 3266 user_record = nm_find_user_record(user, (char *)node->data); |
3267 if (user_record) { | 3267 if (user_record) { |
3268 name = nm_user_record_get_display_id(user_record); | 3268 name = nm_user_record_get_display_id(user_record); |
3269 | 3269 |
3270 if (!g_slist_find_custom(gc->account->permit, | 3270 if (!g_slist_find_custom(gc->account->permit, |
3271 name, (GCompareFunc)nm_utf8_strcasecmp)) { | 3271 name, (GCompareFunc)purple_utf8_strcasecmp)) { |
3272 purple_privacy_permit_add(gc->account, name , TRUE); | 3272 purple_privacy_permit_add(gc->account, name , TRUE); |
3273 } | 3273 } |
3274 } | 3274 } |
3275 } | 3275 } |
3276 | 3276 |
3280 if (dn) { | 3280 if (dn) { |
3281 user_record = nm_find_user_record(user, dn); | 3281 user_record = nm_find_user_record(user, dn); |
3282 name = nm_user_record_get_display_id(user_record); | 3282 name = nm_user_record_get_display_id(user_record); |
3283 | 3283 |
3284 if (!g_slist_find_custom(user->allow_list, | 3284 if (!g_slist_find_custom(user->allow_list, |
3285 dn, (GCompareFunc)nm_utf8_strcasecmp)) { | 3285 dn, (GCompareFunc)purple_utf8_strcasecmp)) { |
3286 rc = nm_send_create_privacy_item(user, dn, TRUE, | 3286 rc = nm_send_create_privacy_item(user, dn, TRUE, |
3287 _create_privacy_item_deny_resp_cb, | 3287 _create_privacy_item_deny_resp_cb, |
3288 g_strdup(dn)); | 3288 g_strdup(dn)); |
3289 } | 3289 } |
3290 } else { | 3290 } else { |
3308 user_record = nm_find_user_record(user, (char *)node->data); | 3308 user_record = nm_find_user_record(user, (char *)node->data); |
3309 if (user_record) { | 3309 if (user_record) { |
3310 name = nm_user_record_get_display_id(user_record); | 3310 name = nm_user_record_get_display_id(user_record); |
3311 | 3311 |
3312 if (!g_slist_find_custom(gc->account->deny, | 3312 if (!g_slist_find_custom(gc->account->deny, |
3313 name, (GCompareFunc)nm_utf8_strcasecmp)) { | 3313 name, (GCompareFunc)purple_utf8_strcasecmp)) { |
3314 purple_privacy_deny_add(gc->account, name , TRUE); | 3314 purple_privacy_deny_add(gc->account, name , TRUE); |
3315 } | 3315 } |
3316 } | 3316 } |
3317 } | 3317 } |
3318 | 3318 |
3323 if (dn) { | 3323 if (dn) { |
3324 user_record = nm_find_user_record(user, dn); | 3324 user_record = nm_find_user_record(user, dn); |
3325 name = nm_user_record_get_display_id(user_record); | 3325 name = nm_user_record_get_display_id(user_record); |
3326 | 3326 |
3327 if (!g_slist_find_custom(user->deny_list, | 3327 if (!g_slist_find_custom(user->deny_list, |
3328 dn, (GCompareFunc)nm_utf8_strcasecmp)) { | 3328 dn, (GCompareFunc)purple_utf8_strcasecmp)) { |
3329 rc = nm_send_create_privacy_item(user, dn, FALSE, | 3329 rc = nm_send_create_privacy_item(user, dn, FALSE, |
3330 _create_privacy_item_deny_resp_cb, | 3330 _create_privacy_item_deny_resp_cb, |
3331 g_strdup(name)); | 3331 g_strdup(name)); |
3332 } | 3332 } |
3333 } else { | 3333 } else { |
3356 num_contacts = nm_folder_get_contact_count(user->root_folder); | 3356 num_contacts = nm_folder_get_contact_count(user->root_folder); |
3357 for (i = 0; i < num_contacts; i++) { | 3357 for (i = 0; i < num_contacts; i++) { |
3358 contact = nm_folder_get_contact(user->root_folder, i); | 3358 contact = nm_folder_get_contact(user->root_folder, i); |
3359 dn = nm_contact_get_dn(contact); | 3359 dn = nm_contact_get_dn(contact); |
3360 if (dn && !g_slist_find_custom(user->allow_list, | 3360 if (dn && !g_slist_find_custom(user->allow_list, |
3361 dn, (GCompareFunc)nm_utf8_strcasecmp)) | 3361 dn, (GCompareFunc)purple_utf8_strcasecmp)) |
3362 { | 3362 { |
3363 rc = nm_send_create_privacy_item(user, dn, TRUE, | 3363 rc = nm_send_create_privacy_item(user, dn, TRUE, |
3364 _create_privacy_item_deny_resp_cb, | 3364 _create_privacy_item_deny_resp_cb, |
3365 g_strdup(dn)); | 3365 g_strdup(dn)); |
3366 if (_check_for_disconnect(user, rc)) | 3366 if (_check_for_disconnect(user, rc)) |
3375 num_contacts = nm_folder_get_contact_count(folder); | 3375 num_contacts = nm_folder_get_contact_count(folder); |
3376 for (j = 0; j < num_contacts; j++) { | 3376 for (j = 0; j < num_contacts; j++) { |
3377 contact = nm_folder_get_contact(folder, j); | 3377 contact = nm_folder_get_contact(folder, j); |
3378 dn = nm_contact_get_dn(contact); | 3378 dn = nm_contact_get_dn(contact); |
3379 if (dn && !g_slist_find_custom(user->allow_list, | 3379 if (dn && !g_slist_find_custom(user->allow_list, |
3380 dn, (GCompareFunc)nm_utf8_strcasecmp)) | 3380 dn, (GCompareFunc)purple_utf8_strcasecmp)) |
3381 { | 3381 { |
3382 rc = nm_send_create_privacy_item(user, dn, TRUE, | 3382 rc = nm_send_create_privacy_item(user, dn, TRUE, |
3383 _create_privacy_item_deny_resp_cb, | 3383 _create_privacy_item_deny_resp_cb, |
3384 g_strdup(dn)); | 3384 g_strdup(dn)); |
3385 if (_check_for_disconnect(user, rc)) | 3385 if (_check_for_disconnect(user, rc)) |