Mercurial > pidgin

comparison libpurple/protocols/msn/user.c @ 23471:5a6cf27ead31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove MSN's use of a "store name" in favour of the "friendly name" since it's really just a duplicate of that data.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 07 Jun 2008 06:39:13 +0000
parents 5cdd93dac7a2
children 31b5a1334e7e
comparison
equal deleted inserted replaced
23470:eb8bd060b987 23471:5a6cf27ead31
26 #include "slp.h" 26 #include "slp.h"
27 27
28 /*new a user object*/ 28 /*new a user object*/
29 MsnUser * 29 MsnUser *
30 msn_user_new(MsnUserList *userlist, const char *passport, 30 msn_user_new(MsnUserList *userlist, const char *passport,
31 const char *store_name) 31 const char *friendly_name)
32 { 32 {
33 MsnUser *user; 33 MsnUser *user;
34 34
35 user = g_new0(MsnUser, 1); 35 user = g_new0(MsnUser, 1);
36 36
37 user->userlist = userlist; 37 user->userlist = userlist;
38 38
39 msn_user_set_passport(user, passport); 39 msn_user_set_passport(user, passport);
40 msn_user_set_store_name(user, store_name); 40 msn_user_set_friendly_name(user, friendly_name);
41
42 /*
43 * XXX This seems to reset the friendly name from what it should be
44 * to the passport when moving users. So, screw it :)
45 */
46 #if 0
47 if (name != NULL)
48 msn_user_set_name(user, name);
49 #endif
50 41
51 return user; 42 return user;
52 } 43 }
53 44
54 /*destroy a user object*/ 45 /*destroy a user object*/
73 if (user->msnobj != NULL) 64 if (user->msnobj != NULL)
74 msn_object_destroy(user->msnobj); 65 msn_object_destroy(user->msnobj);
75 66
76 g_free(user->passport); 67 g_free(user->passport);
77 g_free(user->friendly_name); 68 g_free(user->friendly_name);
78 g_free(user->store_name);
79 g_free(user->uid); 69 g_free(user->uid);
80 g_free(user->phone.home); 70 g_free(user->phone.home);
81 g_free(user->phone.work); 71 g_free(user->phone.work);
82 g_free(user->phone.mobile); 72 g_free(user->phone.mobile);
83 g_free(user->media.artist); 73 g_free(user->media.artist);
197 user->media.artist = media ? g_strdup(media->artist) : NULL; 187 user->media.artist = media ? g_strdup(media->artist) : NULL;
198 user->media.album = media ? g_strdup(media->album) : NULL; 188 user->media.album = media ? g_strdup(media->album) : NULL;
199 } 189 }
200 190
201 void 191 void
202 msn_user_set_store_name(MsnUser *user, const char *name)
203 {
204 g_return_if_fail(user != NULL);
205
206 if (name != NULL)
207 {
208 g_free(user->store_name);
209 user->store_name = g_strdup(name);
210 }
211 }
212
213 void
214 msn_user_set_uid(MsnUser *user, const char *uid) 192 msn_user_set_uid(MsnUser *user, const char *uid)
215 { 193 {
216 g_return_if_fail(user != NULL); 194 g_return_if_fail(user != NULL);
217 195
218 g_free(user->uid); 196 g_free(user->uid);
420 398
421 return user->friendly_name; 399 return user->friendly_name;
422 } 400 }
423 401
424 const char * 402 const char *
425 msn_user_get_store_name(const MsnUser *user)
426 {
427 g_return_val_if_fail(user != NULL, NULL);
428
429 return user->store_name;
430 }
431
432 const char *
433 msn_user_get_home_phone(const MsnUser *user) 403 msn_user_get_home_phone(const MsnUser *user)
434 { 404 {
435 g_return_val_if_fail(user != NULL, NULL); 405 g_return_val_if_fail(user != NULL, NULL);
436 406
437 return user->phone.home; 407 return user->phone.home;