Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/roster.c @ 15634:b4ac51aebf65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix problem with the previous leak fix pointed out by Etan.
author Evan Schoenberg <evan.s@dreskin.net>
date Wed, 14 Feb 2007 04:26:10 +0000
parents 0b16a4aa4e2b
children e926951e61fe
comparison
equal deleted inserted replaced
15633:deea490f2d91 15634:b4ac51aebf65
174 if(subscription) { 174 if(subscription) {
175 gint me = -1; 175 gint me = -1;
176 char *jid_norm; 176 char *jid_norm;
177 const char *username; 177 const char *username;
178 178
179 jid_norm = jabber_normalize(js->gc->account, jid); 179 jid_norm = g_strdup(jabber_normalize(js->gc->account, jid));
180 username = gaim_account_get_username(js->gc->account); 180 username = gaim_account_get_username(js->gc->account);
181 me = g_utf8_collate(jid_norm, 181 me = g_utf8_collate(jid_norm,
182 jabber_normalize(js->gc->account, 182 jabber_normalize(js->gc->account,
183 username)); 183 username));
184 g_free(jid_norm);
184 185
185 if(me == 0) 186 if(me == 0)
186 jb->subscription = JABBER_SUB_BOTH; 187 jb->subscription = JABBER_SUB_BOTH;
187 else if(!strcmp(subscription, "none")) 188 else if(!strcmp(subscription, "none"))
188 jb->subscription = JABBER_SUB_NONE; 189 jb->subscription = JABBER_SUB_NONE;