Mercurial > pidgin.yaz
changeset 22471:fa8739314372
merge of '212ddad0deea54f08e3194c79d2a60584f60d855'
and '8ca6a80e2cd7fbbc59983f8ba370f7276e062db9'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sat, 15 Mar 2008 19:39:31 +0000 |
| parents | 77b6ff5bdb07 (current diff) 4900f9b9827f (diff) |
| children | 7a815907ba5a |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/imgstore.c Sat Mar 15 19:39:10 2008 +0000 +++ b/libpurple/imgstore.c Sat Mar 15 19:39:31 2008 +0000 @@ -1,5 +1,5 @@ /** - * @file imgstore.h IM Image Store API + * @file imgstore.c IM Image Store API * @ingroup core */
--- a/libpurple/imgstore.h Sat Mar 15 19:39:10 2008 +0000 +++ b/libpurple/imgstore.h Sat Mar 15 19:39:31 2008 +0000 @@ -29,6 +29,9 @@ #include <glib.h> +/** A reference-counted immutable wrapper around an image's data and its + * filename. + */ typedef struct _PurpleStoredImage PurpleStoredImage; #ifdef __cplusplus
--- a/libpurple/protocols/myspace/myspace.c Sat Mar 15 19:39:10 2008 +0000 +++ b/libpurple/protocols/myspace/myspace.c Sat Mar 15 19:39:31 2008 +0000 @@ -1862,7 +1862,7 @@ if (!purple_account_get_remember_password(session->account)) purple_account_set_password(session->account, NULL); #ifdef MSIM_MAX_PASSWORD_LENGTH - if (strlen(session->account->password) > MSIM_MAX_PASSWORD_LENGTH) { + if (session->account->password && (strlen(session->account->password) > MSIM_MAX_PASSWORD_LENGTH)) { gchar *suggestion; suggestion = g_strdup_printf(_("%s Your password is "