Mercurial > pidgin

comparison libpurple/protocols/jabber/google.c @ 28758:531f8367025e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
jabber: Clean up this code a little.
author Paul Aurich <paul@darkrain42.org>
date Sat, 05 Dec 2009 22:48:34 +0000
parents 9ae3e70a327b
children edf0aa0e55cb
comparison
equal deleted inserted replaced
28757:d51d97e0d28d 28758:531f8367025e
1030 1030
1031 g_free(jid_norm); 1031 g_free(jid_norm);
1032 return TRUE; 1032 return TRUE;
1033 } 1033 }
1034 1034
1035 void jabber_google_roster_add_deny(PurpleConnection *gc, const char *who) 1035 void jabber_google_roster_add_deny(JabberStream *js, const char *who)
1036 { 1036 {
1037 JabberStream *js; 1037 PurpleAccount *account;
1038 GSList *buddies; 1038 GSList *buddies;
1039 JabberIq *iq; 1039 JabberIq *iq;
1040 xmlnode *query; 1040 xmlnode *query;
1041 xmlnode *item; 1041 xmlnode *item;
1042 xmlnode *group; 1042 xmlnode *group;
1043 PurpleBuddy *b; 1043 PurpleBuddy *b;
1044 JabberBuddy *jb; 1044 JabberBuddy *jb;
1045 const char *balias; 1045 const char *balias;
1046 1046
1047 js = (JabberStream*)(gc->proto_data);
1048
1049 if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
1050 return;
1051
1052 jb = jabber_buddy_find(js, who, TRUE); 1047 jb = jabber_buddy_find(js, who, TRUE);
1053 1048
1054 buddies = purple_find_buddies(js->gc->account, who); 1049 account = purple_connection_get_account(js->gc);
1050 buddies = purple_find_buddies(account, who);
1055 if(!buddies) 1051 if(!buddies)
1056 return; 1052 return;
1057 1053
1058 b = buddies->data; 1054 b = buddies->data;
1059 1055
1096 } 1092 }
1097 l = l->next; 1093 l = l->next;
1098 } 1094 }
1099 } 1095 }
1100 1096
1101 purple_prpl_got_user_status(purple_connection_get_account(gc), who, "offline", NULL); 1097 purple_prpl_got_user_status(account, who, "offline", NULL);
1102 } 1098 }
1103 1099
1104 void jabber_google_roster_rem_deny(PurpleConnection *gc, const char *who) 1100 void jabber_google_roster_rem_deny(JabberStream *js, const char *who)
1105 { 1101 {
1106 JabberStream *js;
1107 GSList *buddies; 1102 GSList *buddies;
1108 JabberIq *iq; 1103 JabberIq *iq;
1109 xmlnode *query; 1104 xmlnode *query;
1110 xmlnode *item; 1105 xmlnode *item;
1111 xmlnode *group; 1106 xmlnode *group;
1112 PurpleBuddy *b; 1107 PurpleBuddy *b;
1113 const char *balias; 1108 const char *balias;
1114
1115 g_return_if_fail(gc != NULL);
1116 g_return_if_fail(who != NULL);
1117
1118 js = (JabberStream*)(gc->proto_data);
1119
1120 if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
1121 return;
1122 1109
1123 buddies = purple_find_buddies(purple_connection_get_account(js->gc), who); 1110 buddies = purple_find_buddies(purple_connection_get_account(js->gc), who);
1124 if(!buddies) 1111 if(!buddies)
1125 return; 1112 return;
1126 1113