diff options
| author | Richard Laager <rlaager@pidgin.im> | 2007-04-15 03:43:17 +0000 |
|---|---|---|
| committer | Richard Laager <rlaager@pidgin.im> | 2007-04-15 03:43:17 +0000 |
| commit | a64d635d9333b31bad15f2d028014fcc0e99f338 (patch) | |
| tree | f06e3c5f479f337ea8c07a13eb8850c04649faa3 /libpurple/protocols/msn/group.c | |
| parent | d4492588302ed1c334c6fa1e6e37f8d74d6c8c83 (diff) | |
| parent | 05f2de4daffc33287f911f6f3d785c826f238f26 (diff) | |
| download | pidgin-a64d635d9333b31bad15f2d028014fcc0e99f338.tar.gz | |
propagate from branch 'im.pidgin.pidgin' (head 88b7040408c88e4516c008f4eac579f98ef53e85)
to branch 'im.pidgin.rlaager.merging.msnp13-and-pidgin' (head 198222e01a7dc9f8795f68ec618a48c3478e04a8)
Diffstat (limited to 'libpurple/protocols/msn/group.c')
| -rw-r--r-- | libpurple/protocols/msn/group.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libpurple/protocols/msn/group.c b/libpurple/protocols/msn/group.c index c5aecb63b2..2b45ef6c1a 100644 --- a/libpurple/protocols/msn/group.c +++ b/libpurple/protocols/msn/group.c @@ -25,18 +25,18 @@ #include "group.h" MsnGroup * -msn_group_new(MsnUserList *userlist, int id, const char *name) +msn_group_new(MsnUserList *userlist, const char *id, const char *name) { MsnGroup *group; - g_return_val_if_fail(id >= 0, NULL); + g_return_val_if_fail(id != NULL, NULL); g_return_val_if_fail(name != NULL, NULL); group = g_new0(MsnGroup, 1); msn_userlist_add_group(userlist, group); - group->id = id; + group->id = g_strdup(id); group->name = g_strdup(name); return group; @@ -47,17 +47,18 @@ msn_group_destroy(MsnGroup *group) { g_return_if_fail(group != NULL); + g_free(group->id); g_free(group->name); g_free(group); } void -msn_group_set_id(MsnGroup *group, int id) +msn_group_set_id(MsnGroup *group, const char *id) { g_return_if_fail(group != NULL); - g_return_if_fail(id >= 0); + g_return_if_fail(id != NULL); - group->id = id; + group->id = g_strdup(id); } void @@ -72,10 +73,10 @@ msn_group_set_name(MsnGroup *group, const char *name) group->name = g_strdup(name); } -int +char* msn_group_get_id(const MsnGroup *group) { - g_return_val_if_fail(group != NULL, -1); + g_return_val_if_fail(group != NULL, NULL); return group->id; } @@ -87,3 +88,4 @@ msn_group_get_name(const MsnGroup *group) return group->name; } + |