Mercurial > pidgin
changeset 16846:30ab55257a16
merge of '8948aba7b9483266336ba61d523cddcda48dbb78'
and 'f58372d9f7e407c3a201b211b9a742dfd01bdfac'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Thu, 03 May 2007 23:17:16 +0000 |
| parents | 2afea2b41cab (diff) 25338643b420 (current diff) |
| children | 9862a82206ba |
| files | |
| diffstat | 1 files changed, 7 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/notification.c Thu May 03 23:01:25 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Thu May 03 23:17:16 2007 +0000 @@ -947,7 +947,7 @@ url = cmd->params[2]; buf = g_strdup_printf("%s%lu%s", - session->passport_info.mspauth, + session->passport_info.mspauth ? session->passport_info.mspauth : "BOGUS", time(NULL) - session->passport_info.sl, purple_connection_get_password(account->gc)); @@ -1142,33 +1142,25 @@ if ((value = msn_message_get_attr(msg, "kv")) != NULL) { - if (session->passport_info.kv != NULL) - g_free(session->passport_info.kv); - + g_free(session->passport_info.kv); session->passport_info.kv = g_strdup(value); } if ((value = msn_message_get_attr(msg, "sid")) != NULL) { - if (session->passport_info.sid != NULL) - g_free(session->passport_info.sid); - + g_free(session->passport_info.sid); session->passport_info.sid = g_strdup(value); } if ((value = msn_message_get_attr(msg, "MSPAuth")) != NULL) { - if (session->passport_info.mspauth != NULL) - g_free(session->passport_info.mspauth); - + g_free(session->passport_info.mspauth); session->passport_info.mspauth = g_strdup(value); } if ((value = msn_message_get_attr(msg, "ClientIP")) != NULL) { - if (session->passport_info.client_ip != NULL) - g_free(session->passport_info.client_ip); - + g_free(session->passport_info.client_ip); session->passport_info.client_ip = g_strdup(value); } @@ -1279,11 +1271,8 @@ msn_user_get_passport(session->user), session->passport_info.file, NULL, NULL); - if (from != NULL) - g_free(from); - - if (subject != NULL) - g_free(subject); + g_free(from); + g_free(subject); g_hash_table_destroy(table); }