Mercurial > pidgin
changeset 21350:0cb8d5304f4f
merge of '1d521d53265eb98ae00fd955fb78a1d39e4c8ba6'
and '5b2cb18f428ccca152f7501832fc095d48aa6052'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 16 Nov 2007 23:01:23 +0000 |
| parents | 14e8ad7bc9a4 (current diff) d4f95419be45 (diff) |
| children | 7b30d02a36aa |
| files | libpurple/protocols/qq/sys_msg.c libpurple/protocols/silc/chat.c libpurple/request.h pidgin/gtkblist.c pidgin/gtkdebug.c pidgin/gtkdialogs.c pidgin/gtkimhtmltoolbar.c pidgin/gtkplugin.c pidgin/gtkpounce.c pidgin/gtkrequest.c |
| diffstat | 4 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Doxyfile.in Fri Nov 16 23:01:09 2007 +0000 +++ b/Doxyfile.in Fri Nov 16 23:01:23 2007 +0000 @@ -169,7 +169,8 @@ "endsignalproto=@endcode" \ "signaldesc=@par Description:" \ "signals=@b Signals:" \ - "endsignals=" + "endsignals=" \ + "constreturn=@note The return value of this function must not be modified or freed. @return" # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources # only. Doxygen will then generate output that is more tailored for C.
--- a/libpurple/certificate.h Fri Nov 16 23:01:09 2007 +0000 +++ b/libpurple/certificate.h Fri Nov 16 23:01:23 2007 +0000 @@ -435,7 +435,7 @@ * * @return TRUE if 'crt' has a valid signature made by 'issuer', * otherwise FALSE - * @TODO Find a way to give the reason (bad signature, not the issuer, etc.) + * @todo Find a way to give the reason (bad signature, not the issuer, etc.) */ gboolean purple_certificate_signed_by(PurpleCertificate *crt, PurpleCertificate *issuer); @@ -450,7 +450,7 @@ * @param chain List of PurpleCertificate instances comprising the chain, * in the order certificate, issuer, issuer's issuer, etc. * @return TRUE if the chain is valid. See description. - * @TODO Specify which certificate in the chain caused a failure + * @todo Specify which certificate in the chain caused a failure */ gboolean purple_certificate_check_signature_chain(GList *chain); @@ -781,7 +781,7 @@ * Displays a window showing X.509 certificate information * * @param crt Certificate under an "x509" Scheme - * @TODO Will break on CA certs, as they have no Common Name + * @todo Will break on CA certs, as they have no Common Name */ void purple_certificate_display_x509(PurpleCertificate *crt);
--- a/libpurple/dnsquery.h Fri Nov 16 23:01:09 2007 +0000 +++ b/libpurple/dnsquery.h Fri Nov 16 23:01:23 2007 +0000 @@ -59,7 +59,7 @@ PurpleDnsQueryFailedCallback failed_cb); /** Called just before @a query_data is freed; this should cancel any - * further use of @q query_data the UI would make. Unneeded if + * further use of @a query_data the UI would make. Unneeded if * #resolve_host is not implemented. */ void (*destroy)(PurpleDnsQueryData *query_data);
--- a/libpurple/prpl.h Fri Nov 16 23:01:09 2007 +0000 +++ b/libpurple/prpl.h Fri Nov 16 23:01:23 2007 +0000 @@ -297,12 +297,13 @@ /** new user registration */ void (*register_user)(PurpleAccount *); - /** Deprecated and vestigal; use #get_cb_real_name and #get_info - * instead. + /** + * @deprecated Use #PurplePluginProtocolInfo.get_info instead. */ void (*get_cb_info)(PurpleConnection *, int, const char *who); - /** Also deprecated and vestigal; use #get_cb_real_name and - * #status_text instead. + /** + * @deprecated Use #PurplePluginProtocolInfo.get_cb_real_name and + * #PurplePluginProtocolInfo.status_text instead. */ void (*get_cb_away)(PurpleConnection *, int, const char *who);