Mercurial > pidgin.yaz
comparison libpurple/protocols/myspace/user.c @ 25379:4e8748f3374f
explicit merge of 'cfb115ff00c406f8011c0d661d33bee60813b27c'
and '65a6b2bf1ab03c791a4444120e325ce42d9471f2'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 02 Jan 2009 22:23:38 +0000 |
parents | 47540809ae91 22fd7467f0cc |
children | 43b721aa4b76 |
comparison
equal
deleted
inserted
replaced
25378:47540809ae91 | 25379:4e8748f3374f |
---|---|
291 const char *name = user->buddy ? purple_buddy_get_name(user->buddy) : NULL; | 291 const char *name = user->buddy ? purple_buddy_get_name(user->buddy) : NULL; |
292 | 292 |
293 if (g_str_equal(key_str, "UserID") || g_str_equal(key_str, "ContactID")) { | 293 if (g_str_equal(key_str, "UserID") || g_str_equal(key_str, "ContactID")) { |
294 /* Save to buddy list, if it exists, for quick cached uid lookup with msim_uid2username_from_blist(). */ | 294 /* Save to buddy list, if it exists, for quick cached uid lookup with msim_uid2username_from_blist(). */ |
295 user->id = atol(value_str); | 295 user->id = atol(value_str); |
296 g_free(value_str); | |
296 if (user->buddy) | 297 if (user->buddy) |
297 { | 298 { |
298 purple_debug_info("msim", "associating uid %s with username %s\n", key_str, name); | 299 purple_debug_info("msim", "associating uid %s with username %s\n", key_str, name); |
299 purple_blist_node_set_int(PURPLE_BLIST_NODE(user->buddy), "UserID", user->id); | 300 purple_blist_node_set_int(PURPLE_BLIST_NODE(user->buddy), "UserID", user->id); |
300 } | 301 } |
308 } else if (g_str_equal(key_str, "Location")) { | 309 } else if (g_str_equal(key_str, "Location")) { |
309 g_free(user->location); | 310 g_free(user->location); |
310 user->location = value_str; | 311 user->location = value_str; |
311 } else if (g_str_equal(key_str, "TotalFriends")) { | 312 } else if (g_str_equal(key_str, "TotalFriends")) { |
312 user->total_friends = atol(value_str); | 313 user->total_friends = atol(value_str); |
314 g_free(value_str); | |
313 } else if (g_str_equal(key_str, "DisplayName")) { | 315 } else if (g_str_equal(key_str, "DisplayName")) { |
314 g_free(user->display_name); | 316 g_free(user->display_name); |
315 user->display_name = value_str; | 317 user->display_name = value_str; |
316 } else if (g_str_equal(key_str, "BandName")) { | 318 } else if (g_str_equal(key_str, "BandName")) { |
317 msim_set_artist_or_title(user, value_str, NULL); | 319 msim_set_artist_or_title(user, value_str, NULL); |
320 g_free(value_str); | |
318 } else if (g_str_equal(key_str, "SongName")) { | 321 } else if (g_str_equal(key_str, "SongName")) { |
319 msim_set_artist_or_title(user, NULL, value_str); | 322 msim_set_artist_or_title(user, NULL, value_str); |
323 g_free(value_str); | |
320 } else if (g_str_equal(key_str, "UserName") || g_str_equal(key_str, "IMName") || g_str_equal(key_str, "NickName")) { | 324 } else if (g_str_equal(key_str, "UserName") || g_str_equal(key_str, "IMName") || g_str_equal(key_str, "NickName")) { |
321 /* Ignore because PurpleBuddy knows this already */ | 325 /* Ignore because PurpleBuddy knows this already */ |
322 g_free(value_str); | 326 g_free(value_str); |
323 } else if (g_str_equal(key_str, "ImageURL") || g_str_equal(key_str, "AvatarURL")) { | 327 } else if (g_str_equal(key_str, "ImageURL") || g_str_equal(key_str, "AvatarURL")) { |
324 const gchar *previous_url; | 328 const gchar *previous_url; |