Mercurial > pidgin
comparison src/gtkprefs.c @ 10167:cf45c2a6a7cf
[gaim-migrate @ 11254]
Some stuff - fix a crash removing chats from the buddy list, escape aliases
in buddy pounce popups and the state notifications from the state notify
plugin, and fix a corner-case crash in smiley theme sorting.
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Wed, 10 Nov 2004 17:08:32 +0000 |
| parents | 3f71f7282dbf |
| children | e6372844a4b8 |
comparison
equal
deleted
inserted
replaced
| 10166:72c9e9bb2c19 | 10167:cf45c2a6a7cf |
|---|---|
| 606 | 606 |
| 607 if (name1 == NULL || name2 == NULL) { | 607 if (name1 == NULL || name2 == NULL) { |
| 608 if (!(name1 == NULL && name2 == NULL)) | 608 if (!(name1 == NULL && name2 == NULL)) |
| 609 ret = (name1 == NULL) ? -1: 1; | 609 ret = (name1 == NULL) ? -1: 1; |
| 610 } else if (!g_ascii_strcasecmp(name1, "none")) { | 610 } else if (!g_ascii_strcasecmp(name1, "none")) { |
| 611 /* Sort name1 first */ | 611 if (!g_utf8_collate(name1, name2)) |
| 612 ret = -1; | 612 ret = 0; |
| 613 else | |
| 614 /* Sort name1 first */ | |
| 615 ret = -1; | |
| 613 } else if (!g_ascii_strcasecmp(name2, "none")) { | 616 } else if (!g_ascii_strcasecmp(name2, "none")) { |
| 614 /* Sort name2 first */ | 617 /* Sort name2 first */ |
| 615 ret = 1; | 618 ret = 1; |
| 616 } else { | 619 } else { |
| 617 /* Neither string is "none", default to normal sort */ | 620 /* Neither string is "none", default to normal sort */ |