Mercurial > pidgin
changeset 21746:82016f2ea290
merge of '36ed28f7212302e500d79866f33eacde299878b2'
and 'ef615b4ae18609e0cbe2783aafc7a5114db4a06f'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Mon, 03 Dec 2007 16:20:59 +0000 |
| parents | ea18c129edfb (diff) 2c0ae5e29376 (current diff) |
| children | d376b1e191b5 |
| files | |
| diffstat | 2 files changed, 19 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Dec 03 08:57:47 2007 +0000 +++ b/configure.ac Mon Dec 03 16:20:59 2007 +0000 @@ -1659,16 +1659,24 @@ ]) mozilla_nspr="mozilla-nspr" mozilla_nss="mozilla-nss" - else - if `$PKG_CONFIG --exists nss`; then - PKG_CHECK_MODULES(NSS, nss, [ - have_nss="yes" - ], [ - AC_MSG_RESULT(no) - ]) - mozilla_nspr="nspr" - mozilla_nss="nss" - fi + elif `$PKG_CONFIG --exists nss`; then + PKG_CHECK_MODULES(NSS, nss, [ + have_nss="yes" + ], [ + AC_MSG_RESULT(no) + have_nss="no" + ]) + mozilla_nspr="nspr" + mozilla_nss="nss" + elif `$PKG_CONFIG --exists microb-engine-nss`; then + PKG_CHECK_MODULES(NSS, microb-engine-nss, [ + have_nss="yes" + ], [ + AC_MSG_RESULT(no) + have_nss="no" + ]) + mozilla_nspr="mozilla-nspr" + mozilla_nss="microb-engine-nss" fi if test "x$have_nss" = "xyes"; then
--- a/libpurple/blist.c Mon Dec 03 08:57:47 2007 +0000 +++ b/libpurple/blist.c Mon Dec 03 16:20:59 2007 +0000 @@ -1310,7 +1310,7 @@ g = (PurpleGroup *)((PurpleBlistNode *)c)->parent; } else { if (group) { - /* Add chat to blist if isn't already on it. Fixes #2752. */ + /* Add group to blist if isn't already on it. Fixes #2752. */ if (!purple_find_group(group->name)) { purple_blist_add_group(group, purple_blist_get_last_sibling(purplebuddylist->root));