Mercurial > pidgin
comparison src/protocols/jabber/presence.c @ 10116:9f358a718f38
[gaim-migrate @ 11153]
I went through every commit email on oldstatus since we branched, and merged
relevant things to HEAD that had only been applied on oldstatus.
committer: Tailor Script <tailor@pidgin.im>
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Mon, 18 Oct 2004 19:02:33 +0000 |
parents | bd5517471d99 |
children | 4e7249591251 |
comparison
equal
deleted
inserted
replaced
10115:4fd312ceaa29 | 10116:9f358a718f38 |
---|---|
207 struct _jabber_add_permit *jap = g_new0(struct _jabber_add_permit, 1); | 207 struct _jabber_add_permit *jap = g_new0(struct _jabber_add_permit, 1); |
208 char *msg = g_strdup_printf(_("The user %s wants to add you to their buddy list."), from); | 208 char *msg = g_strdup_printf(_("The user %s wants to add you to their buddy list."), from); |
209 jap->gc = js->gc; | 209 jap->gc = js->gc; |
210 jap->who = g_strdup(from); | 210 jap->who = g_strdup(from); |
211 | 211 |
212 gaim_request_action(js->gc, NULL, msg, NULL, 0, jap, 2, | 212 gaim_request_action(js->gc, NULL, msg, NULL, GAIM_DEFAULT_ACTION_NONE, |
213 jap, 2, | |
213 _("Authorize"), G_CALLBACK(authorize_add_cb), | 214 _("Authorize"), G_CALLBACK(authorize_add_cb), |
214 _("Deny"), G_CALLBACK(deny_add_cb)); | 215 _("Deny"), G_CALLBACK(deny_add_cb)); |
215 g_free(msg); | 216 g_free(msg); |
216 jabber_id_free(jid); | 217 jabber_id_free(jid); |
217 return; | 218 return; |