# HG changeset patch
# User Tim Ringenbach <marv@pidgin.im>
# Date 1106096431 0
# Node ID c3a964f4fc6168224b59d6fbe0959633bfcbe4bf
# Parent  507c680b573ebf8f163559a46eda743124e7e35d
[gaim-migrate @ 11849]
The autopackage will now be built with mozilla-nss support too.
Hopefully this helps those people who couldn't install the 1.1.1 .package
due to having the wrong version (or no version) of gnutls.

Also a spelling fix in conversation.h that I forgot to commit earlier,
thanks Evan Schoenberg, although I meant expects, not accepts.

committer: Tailor Script <tailor@pidgin.im>

diff -r 507c680b573e -r c3a964f4fc61 gaim.apspec.in
--- a/gaim.apspec.in	Tue Jan 18 20:23:25 2005 +0000
+++ b/gaim.apspec.in	Wed Jan 19 01:00:31 2005 +0000
@@ -26,7 +26,7 @@
 Gaim is NOT affiliated with or endorsed by AOL.
 
 [BuildPrepare]
-prepareBuild --disable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl
+prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl
 
 
 [BuildUnprepare]
@@ -45,14 +45,8 @@
 require @xiph.org/libao 2.0
 require @gtkspell.sourceforge.net/gtkspell 0.0
 
-# ap alpha: while gnutls do not provide autopackages, we package this ourselves
-repo="http://autopackage.org/downloads/0.7"
-registerRepository @gnutls.org/gnutls $repo/gnutls.xml
-registerRepository @gnupg.org/libgcrypt $repo/libgcrypt.xml
-registerRepository @gnupg.org/libgpg-error $repo/libgpg-error.xml
-unset repo
+require @gnutls.org/gnutls 11.0 || { require @mozilla.org/nspr 4 && require @mozilla.org/nss 3; }
 
-require @gnutls.org/gnutls 11.1
 
 [Install]
 # Put your installation script here
diff -r 507c680b573e -r c3a964f4fc61 src/conversation.h
--- a/src/conversation.h	Tue Jan 18 20:23:25 2005 +0000
+++ b/src/conversation.h	Wed Jan 19 01:00:31 2005 +0000
@@ -1042,13 +1042,18 @@
 void gaim_conv_im_send(GaimConvIm *im, const char *message);
 
 /**
- * Adds a smiley to the conversation's smiley tree.
+ * Adds a smiley to the conversation's smiley tree. If this returns
+ * @c TRUE you should call gaim_conv_custom_smiley_write() one or more
+ * times, and then gaim_conv_custom_smiley_close(). If this returns
+ * @c FALSE, either the conv or smile were invalid, or the icon was
+ * found in the cache. In either case, calling write or close would
+ * be an error.
  *
  * @param conv The conversation to associate the smiley with.
  * @param smile The text associated with the smiley
  * @param cksum_type The type of checksum.
  * @param chksum The checksum, as a NUL terminated base64 string.
- * @return      @c TRUE if an icon is excepted, else FALSE. Note that
+ * @return      @c TRUE if an icon is expected, else FALSE. Note that
  *              it is an error to never call gaim_conv_custom_smiley_close if
  *              this function returns @c TRUE, but an error to call it if
  *              @c FALSE is returned.