summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadrul Habib Chowdhury <sadrul@pidgin.im>2008-10-04 21:46:10 +0000
committerSadrul Habib Chowdhury <sadrul@pidgin.im>2008-10-04 21:46:10 +0000
commit65a637da9cd60700ec178cde1ed3dd24e0695f46 (patch)
tree67e421d89ba4e508c3a284929d1cb4553f6b1b80
parentba4f0d6ef6bd19721184a94d20ec5679e509327b (diff)
downloadpidgin-65a637da9cd60700ec178cde1ed3dd24e0695f46.tar.gz
Revert the accidentally committed pseudo-group changes.
-rw-r--r--libpurple/protocols/msn/contact.c2
-rw-r--r--libpurple/protocols/msn/user.c6
2 files changed, 1 insertions, 7 deletions
diff --git a/libpurple/protocols/msn/contact.c b/libpurple/protocols/msn/contact.c
index af912a55a0..8bf40cf44e 100644
--- a/libpurple/protocols/msn/contact.c
+++ b/libpurple/protocols/msn/contact.c
@@ -730,7 +730,6 @@ msn_parse_addressbook(MsnSession *session, xmlnode *node)
MSN_INDIVIDUALS_GROUP_ID, MSN_INDIVIDUALS_GROUP_NAME);
if ((purple_find_group(MSN_INDIVIDUALS_GROUP_NAME)) == NULL){
PurpleGroup *g = purple_group_new(MSN_INDIVIDUALS_GROUP_NAME);
- purple_group_set_is_pseudo(g, TRUE);
purple_blist_add_group(g, NULL);
}
@@ -739,7 +738,6 @@ msn_parse_addressbook(MsnSession *session, xmlnode *node)
purple_debug_misc("msn", "AB group_id:%s name:%s\n", MSN_NON_IM_GROUP_ID, MSN_NON_IM_GROUP_NAME);
if ((purple_find_group(MSN_NON_IM_GROUP_NAME)) == NULL) {
PurpleGroup *g = purple_group_new(MSN_NON_IM_GROUP_NAME);
- purple_group_set_is_pseudo(g, TRUE);
purple_blist_add_group(g, NULL);
}
diff --git a/libpurple/protocols/msn/user.c b/libpurple/protocols/msn/user.c
index d44f8b5c8c..49c4ff33d3 100644
--- a/libpurple/protocols/msn/user.c
+++ b/libpurple/protocols/msn/user.c
@@ -273,11 +273,7 @@ msn_user_add_group_id(MsnUser *user, const char* group_id)
if (b == NULL)
{
b = purple_buddy_new(account, passport, NULL);
- if (group_id && (!strcmp(group_id, MSN_INDIVIDUALS_GROUP_ID) ||
- !strcmp(group_id, MSN_NON_IM_GROUP_ID)))
- purple_blist_add_buddy_pseudo_group(b, NULL, g, NULL);
- else
- purple_blist_add_buddy(b, NULL, g, NULL);
+ purple_blist_add_buddy(b, NULL, g, NULL);
}
b->proto_data = user;
/*Update the blist Node info*/