Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/msn.c @ 31314:6469c68fa093
propagate from branch 'im.pidgin.pidgin' (head fabc09bf724818b9b50e1c41d4afd6549f298c05)
to branch 'im.pidgin.cpw.qulogic.msnp16' (head d8e8a3b3ec17b199432993002327e4ecf156d12b)
author | masca@cpw.pidgin.im |
---|---|
date | Sat, 11 Sep 2010 19:03:25 +0000 |
parents | e53f81486d57 351d07aefb09 |
children | 23be655cc688 |
comparison
equal
deleted
inserted
replaced
31313:c49697f075cf | 31314:6469c68fa093 |
---|---|
726 static void | 726 static void |
727 show_send_to_mobile_cb(PurpleBlistNode *node, gpointer ignored) | 727 show_send_to_mobile_cb(PurpleBlistNode *node, gpointer ignored) |
728 { | 728 { |
729 PurpleBuddy *buddy; | 729 PurpleBuddy *buddy; |
730 PurpleConnection *gc; | 730 PurpleConnection *gc; |
731 MsnSession *session; | |
732 MsnMobileData *data; | 731 MsnMobileData *data; |
733 PurpleAccount *account; | 732 PurpleAccount *account; |
734 const char *name; | 733 const char *name; |
735 | 734 |
736 g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); | 735 g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); |
737 | 736 |
738 buddy = (PurpleBuddy *) node; | 737 buddy = (PurpleBuddy *) node; |
739 account = purple_buddy_get_account(buddy); | 738 account = purple_buddy_get_account(buddy); |
740 gc = purple_account_get_connection(account); | 739 gc = purple_account_get_connection(account); |
741 name = purple_buddy_get_name(buddy); | 740 name = purple_buddy_get_name(buddy); |
742 | |
743 session = gc->proto_data; | |
744 | 741 |
745 data = g_new0(MsnMobileData, 1); | 742 data = g_new0(MsnMobileData, 1); |
746 data->gc = gc; | 743 data->gc = gc; |
747 data->passport = name; | 744 data->passport = name; |
748 | 745 |
2206 | 2203 |
2207 static void | 2204 static void |
2208 msn_remove_group(PurpleConnection *gc, PurpleGroup *group) | 2205 msn_remove_group(PurpleConnection *gc, PurpleGroup *group) |
2209 { | 2206 { |
2210 MsnSession *session; | 2207 MsnSession *session; |
2211 MsnCmdProc *cmdproc; | |
2212 const char *gname; | 2208 const char *gname; |
2213 | 2209 |
2214 session = gc->proto_data; | 2210 session = gc->proto_data; |
2215 cmdproc = session->notification->cmdproc; | |
2216 gname = purple_group_get_name(group); | 2211 gname = purple_group_get_name(group); |
2217 | 2212 |
2218 purple_debug_info("msn", "Remove group %s\n", gname); | 2213 purple_debug_info("msn", "Remove group %s\n", gname); |
2219 /*we can't delete the default group*/ | 2214 /*we can't delete the default group*/ |
2220 if(!strcmp(gname, MSN_INDIVIDUALS_GROUP_NAME)|| | 2215 if(!strcmp(gname, MSN_INDIVIDUALS_GROUP_NAME)|| |