libpurple/protocols/jabber/roster.c

branch
string-comparison-r2
changeset 38256
035f00c4fd87
parent 38091
be8d0f7d0041
child 38257
1a294a6d2a57
equal deleted inserted replaced
38239:f76c1aa92c07 38256:035f00c4fd87
226 226
227 if(!(jb = jabber_buddy_find(js, jid, TRUE))) 227 if(!(jb = jabber_buddy_find(js, jid, TRUE)))
228 continue; 228 continue;
229 229
230 if(subscription) { 230 if(subscription) {
231 if (g_str_equal(subscription, "remove")) 231 if (purple_strequal(subscription, "remove"))
232 jb->subscription = JABBER_SUB_REMOVE; 232 jb->subscription = JABBER_SUB_REMOVE;
233 else if (jb == js->user_jb) 233 else if (jb == js->user_jb)
234 jb->subscription = JABBER_SUB_BOTH; 234 jb->subscription = JABBER_SUB_BOTH;
235 else if (g_str_equal(subscription, "none")) 235 else if (purple_strequal(subscription, "none"))
236 jb->subscription = JABBER_SUB_NONE; 236 jb->subscription = JABBER_SUB_NONE;
237 else if (g_str_equal(subscription, "to")) 237 else if (purple_strequal(subscription, "to"))
238 jb->subscription = JABBER_SUB_TO; 238 jb->subscription = JABBER_SUB_TO;
239 else if (g_str_equal(subscription, "from")) 239 else if (purple_strequal(subscription, "from"))
240 jb->subscription = JABBER_SUB_FROM; 240 jb->subscription = JABBER_SUB_FROM;
241 else if (g_str_equal(subscription, "both")) 241 else if (purple_strequal(subscription, "both"))
242 jb->subscription = JABBER_SUB_BOTH; 242 jb->subscription = JABBER_SUB_BOTH;
243 } 243 }
244 244
245 if(purple_strequal(ask, "subscribe")) 245 if(purple_strequal(ask, "subscribe"))
246 jb->subscription |= JABBER_SUB_PENDING; 246 jb->subscription |= JABBER_SUB_PENDING;

mercurial