Sat, 19 Nov 2011 23:58:01 +0000
merge of '6cc03d25d5f27238ff6eb3f1317be0a8ebb2d7ae' and '5da1137555a881451f0b717e79a9aa8d7231e62a'
--- a/libpurple/plugins/keyrings/kwallet.cpp Fri Nov 18 19:54:07 2011 +0000 +++ b/libpurple/plugins/keyrings/kwallet.cpp Sat Nov 19 23:58:01 2011 +0000 @@ -307,7 +307,7 @@ { *mode = NULL; *data = NULL; - destroy = NULL; + *destroy = NULL; return TRUE; }