Mercurial > pidgin.yaz
changeset 23353:adda955a8db6
merge of '7be65dacd56b6536cf745747e39a29f4f7f2644b'
and '83642da631db94ab79071de4a45576a91f7f0996'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 11 Jun 2008 15:36:42 +0000 |
| parents | 9cb1e75854f1 (diff) fa904782a934 (current diff) |
| children | 6b09c40a15d1 77f43c248845 26eabe8e739b 2506d79768b8 |
| files | |
| diffstat | 4 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 11 15:36:36 2008 +0000 +++ b/ChangeLog Wed Jun 11 15:36:42 2008 +0000 @@ -7,9 +7,10 @@ Marcus Lundblad, Jorge Villaseñor and other contributors) * Yahoo! Japan now uses UTF-8, matching the behavior of official clients and restoring compatibility with the web messenger (Yusuke Odate) - * Add a configure option, --with-ssl-certificates to allow packagers - to specify a system-wide SSL CA certificates directory. Also, when - set, we don't install our SSL CA certs. + * Add a configure option, --with-system-ssl-certs to allow packagers + to specify a system-wide SSL CA certificates directory. When set, + we don't install our SSL CA certs, so it's important that the + libpurple package depend on the CA certificates. Pidgin: * Custom buddy icons can now be added to and removed from buddy list
--- a/configure.ac Wed Jun 11 15:36:36 2008 +0000 +++ b/configure.ac Wed Jun 11 15:36:42 2008 +0000 @@ -1561,14 +1561,14 @@ dnl # Thanks go to Evolution for the checks. dnl ####################################################################### -AC_ARG_WITH(ssl-certificates, [AC_HELP_STRING([--with-ssl-certificates=<dir>], [directory containing system-wide SSL CA certificates])]) +AC_ARG_WITH(with-system-ssl-certs, [AC_HELP_STRING([--with-system-ssl-certs=<dir>], [directory containing system-wide SSL CA certificates])]) SSL_CERTIFICATES_DIR="" -if ! test -z "$with_ssl_certificates" ; then - if ! test -d "$with_ssl_certificates" ; then - AC_MSG_ERROR([$with_ssl_certificates does not exist, if this is the correct location please make sure that it exists.]) +if ! test -z "$with_system_ssl_certs" ; then + if ! test -d "$with_system_ssl_certs" ; then + AC_MSG_ERROR([$with_system_ssl_certs does not exist, if this is the correct location please make sure that it exists.]) fi - SSL_CERTIFICATES_DIR="$with_ssl_certificates" + SSL_CERTIFICATES_DIR="$with_system_ssl_certs" fi AC_SUBST(SSL_CERTIFICATES_DIR) AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_CERTIFICATES_DIR" = "x")
--- a/libpurple/protocols/jabber/xdata.c Wed Jun 11 15:36:36 2008 +0000 +++ b/libpurple/protocols/jabber/xdata.c Wed Jun 11 15:36:42 2008 +0000 @@ -201,7 +201,7 @@ xmlnode *fn, *x; PurpleRequestFields *fields; PurpleRequestFieldGroup *group; - PurpleRequestField *field; + PurpleRequestField *field = NULL; char *title = NULL; char *instructions = NULL;
--- a/pidgin/plugins/spellchk.c Wed Jun 11 15:36:36 2008 +0000 +++ b/pidgin/plugins/spellchk.c Wed Jun 11 15:36:42 2008 +0000 @@ -1740,6 +1740,7 @@ "BAD wroking\nGOOD working\n" "BAD wtih\nGOOD with\n" "BAD wuould\nGOOD would\n" + "BAD wud\nGOOD would\n" "BAD wut\nGOOD what\n" "BAD wya\nGOOD way\n" "BAD y\nGOOD why\n"