Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/notification.c @ 29351:08296b862f98
Move the three phone numbers from the MsnUser struct into a separate
struct that gets added as needed. Makes MsnUser smaller by 2 pointers.
In practice nobody has phone numbers
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 04 Feb 2010 00:35:15 +0000 |
parents | 99d1b433dba0 |
children | 746bf7d8b34e |
comparison
equal
deleted
inserted
replaced
29350:99d1b433dba0 | 29351:08296b862f98 |
---|---|
1142 } | 1142 } |
1143 g_free(friendly); | 1143 g_free(friendly); |
1144 | 1144 |
1145 msn_user_set_object(user, msnobj); | 1145 msn_user_set_object(user, msnobj); |
1146 | 1146 |
1147 user->mobile = (clientid & MSN_CLIENT_CAP_MSNMOBILE) || (user->phone.mobile && user->phone.mobile[0] == '+'); | 1147 user->mobile = (clientid & MSN_CLIENT_CAP_MSNMOBILE) || (user->phone && user->phone->mobile && user->phone->mobile[0] == '+'); |
1148 msn_user_set_clientid(user, clientid); | 1148 msn_user_set_clientid(user, clientid); |
1149 msn_user_set_network(user, networkid); | 1149 msn_user_set_network(user, networkid); |
1150 | 1150 |
1151 msn_user_set_state(user, state); | 1151 msn_user_set_state(user, state); |
1152 msn_user_update(user); | 1152 msn_user_update(user); |
1314 { | 1314 { |
1315 msn_user_set_object(user, NULL); | 1315 msn_user_set_object(user, NULL); |
1316 } | 1316 } |
1317 | 1317 |
1318 clientid = strtoul(cmd->params[4], NULL, 10); | 1318 clientid = strtoul(cmd->params[4], NULL, 10); |
1319 user->mobile = (clientid & MSN_CLIENT_CAP_MSNMOBILE) || (user->phone.mobile && user->phone.mobile[0] == '+'); | 1319 user->mobile = (clientid & MSN_CLIENT_CAP_MSNMOBILE) || (user->phone && user->phone->mobile && user->phone->mobile[0] == '+'); |
1320 | 1320 |
1321 msn_user_set_clientid(user, clientid); | 1321 msn_user_set_clientid(user, clientid); |
1322 msn_user_set_network(user, networkid); | 1322 msn_user_set_network(user, networkid); |
1323 | 1323 |
1324 msn_user_set_state(user, state); | 1324 msn_user_set_state(user, state); |