comparison libpurple/protocols/msn/user.c @ 23946:169c1451b7e5

Don't crash if user == NULL in a couple more places. Not exactly the real cause, but fixes #6777.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 26 Aug 2008 02:24:17 +0000
parents aaaff38e144f
children e344426d7c28 16734635febf 8d562557ed6f
comparison
equal deleted inserted replaced
23945:60de5d1ee482 23946:169c1451b7e5
82 msn_user_update(MsnUser *user) 82 msn_user_update(MsnUser *user)
83 { 83 {
84 PurpleAccount *account; 84 PurpleAccount *account;
85 gboolean offline; 85 gboolean offline;
86 86
87 g_return_if_fail(user != NULL);
88
87 account = user->userlist->session->account; 89 account = user->userlist->session->account;
88 90
89 offline = (user->status == NULL); 91 offline = (user->status == NULL);
90 92
91 if (!offline) { 93 if (!offline) {
122 124
123 void 125 void
124 msn_user_set_state(MsnUser *user, const char *state) 126 msn_user_set_state(MsnUser *user, const char *state)
125 { 127 {
126 const char *status; 128 const char *status;
129
130 g_return_if_fail(user != NULL);
127 131
128 if (state == NULL) { 132 if (state == NULL) {
129 user->status = NULL; 133 user->status = NULL;
130 return; 134 return;
131 } 135 }
280 gboolean 284 gboolean
281 msn_user_is_online(PurpleAccount *account, const char *name) 285 msn_user_is_online(PurpleAccount *account, const char *name)
282 { 286 {
283 PurpleBuddy *buddy; 287 PurpleBuddy *buddy;
284 288
285 buddy =purple_find_buddy(account,name); 289 buddy = purple_find_buddy(account, name);
286 return PURPLE_BUDDY_IS_ONLINE(buddy); 290 return PURPLE_BUDDY_IS_ONLINE(buddy);
287 } 291 }
288 292
289 gboolean 293 gboolean
290 msn_user_is_yahoo(PurpleAccount *account, const char *name) 294 msn_user_is_yahoo(PurpleAccount *account, const char *name)