Merge trunk.

1 files changed, 3 insertions, 3 deletions

diff --git a/storage.h b/storage.h
index 301b424c..d114dec4 100644
--- a/storage.h
+++ b/storage.h
@@ -32,8 +32,8 @@ typedef enum {
 	STORAGE_INVALID_PASSWORD,
 	STORAGE_ALREADY_EXISTS,
 	STORAGE_OTHER_ERROR /* Error that isn't caused by user input, such as 
-						   a database that is unreachable. log() will be 
-						   used for the exact error message */
+	                       a database that is unreachable. log() will be 
+	                       used for the exact error message */
 } storage_status_t;
 
 typedef struct {
@@ -61,6 +61,6 @@ storage_status_t storage_remove (const char *nick, const char *password);
 storage_status_t storage_rename (const char *onick, const char *nnick, const char *password);
 
 void register_storage_backend(storage_t *);
-GList *storage_init(const char *primary, char **migrate);
+G_GNUC_MALLOC GList *storage_init(const char *primary, char **migrate);
 
 #endif /* __STORAGE_H__ */