Mercurial > pidgin

comparison libpurple/protocols/msn/group.c @ 19843:60bc06498746

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager committer: Richard Laager <rlaager@wiktel.com>
author Ka-Hing Cheung <khc@hxbc.us>
date Sun, 15 Apr 2007 04:12:27 +0000
parents 32c366eeeb99
children 5048651671e1
comparison
equal deleted inserted replaced
16121:6167ee79ecd0 19843:60bc06498746
23 */ 23 */
24 #include "msn.h" 24 #include "msn.h"
25 #include "group.h" 25 #include "group.h"
26 26
27 MsnGroup * 27 MsnGroup *
28 msn_group_new(MsnUserList *userlist, int id, const char *name) 28 msn_group_new(MsnUserList *userlist, const char *id, const char *name)
29 { 29 {
30 MsnGroup *group; 30 MsnGroup *group;
31 31
32 g_return_val_if_fail(id >= 0, NULL); 32 g_return_val_if_fail(id != NULL, NULL);
33 g_return_val_if_fail(name != NULL, NULL); 33 g_return_val_if_fail(name != NULL, NULL);
34 34
35 group = g_new0(MsnGroup, 1); 35 group = g_new0(MsnGroup, 1);
36 36
37 msn_userlist_add_group(userlist, group); 37 msn_userlist_add_group(userlist, group);
38 38
39 group->id = id; 39 group->id = g_strdup(id);
40 group->name = g_strdup(name); 40 group->name = g_strdup(name);
41 41
42 return group; 42 return group;
43 } 43 }
44 44
45 void 45 void
46 msn_group_destroy(MsnGroup *group) 46 msn_group_destroy(MsnGroup *group)
47 { 47 {
48 g_return_if_fail(group != NULL); 48 g_return_if_fail(group != NULL);
49 49
50 g_free(group->id);
50 g_free(group->name); 51 g_free(group->name);
51 g_free(group); 52 g_free(group);
52 } 53 }
53 54
54 void 55 void
55 msn_group_set_id(MsnGroup *group, int id) 56 msn_group_set_id(MsnGroup *group, const char *id)
56 { 57 {
57 g_return_if_fail(group != NULL); 58 g_return_if_fail(group != NULL);
58 g_return_if_fail(id >= 0); 59 g_return_if_fail(id != NULL);
59 60
60 group->id = id; 61 group->id = g_strdup(id);
61 } 62 }
62 63
63 void 64 void
64 msn_group_set_name(MsnGroup *group, const char *name) 65 msn_group_set_name(MsnGroup *group, const char *name)
65 { 66 {
70 g_free(group->name); 71 g_free(group->name);
71 72
72 group->name = g_strdup(name); 73 group->name = g_strdup(name);
73 } 74 }
74 75
75 int 76 char*
76 msn_group_get_id(const MsnGroup *group) 77 msn_group_get_id(const MsnGroup *group)
77 { 78 {
78 g_return_val_if_fail(group != NULL, -1); 79 g_return_val_if_fail(group != NULL, NULL);
79 80
80 return group->id; 81 return group->id;
81 } 82 }
82 83
83 const char * 84 const char *
85 { 86 {
86 g_return_val_if_fail(group != NULL, NULL); 87 g_return_val_if_fail(group != NULL, NULL);
87 88
88 return group->name; 89 return group->name;
89 } 90 }
91