# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1205609971 0
# Node ID fa873931437267f683d2ca00e09f399cfb9f50c9
# Parent  77b6ff5bdb076f5c044e687eb2e164eb3f49397e# Parent  4900f9b9827f5b2f52dc4b23a4a834edba056170
merge of '212ddad0deea54f08e3194c79d2a60584f60d855'
     and '8ca6a80e2cd7fbbc59983f8ba370f7276e062db9'

diff -r 77b6ff5bdb07 -r fa8739314372 libpurple/imgstore.c
--- 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
  */
 
diff -r 77b6ff5bdb07 -r fa8739314372 libpurple/imgstore.h
--- 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
diff -r 77b6ff5bdb07 -r fa8739314372 libpurple/protocols/myspace/myspace.c
--- 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 "