Mercurial > pidgin
diff src/protocols/novell/novell.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 | 1a91e814e9d8 |
| children | a66cf83552dc |
line wrap: on
line diff
--- a/src/protocols/novell/novell.c Mon Oct 18 17:25:25 2004 +0000 +++ b/src/protocols/novell/novell.c Mon Oct 18 19:02:33 2004 +0000 @@ -1894,7 +1894,8 @@ parms = g_slist_append(parms, nm_event_get_conference(event)); /* Prompt the user */ - gaim_request_action(NULL, title, primary, secondary, -1, parms, 2, + gaim_request_action(NULL, title, primary, secondary, + GAIM_DEFAULT_ACTION_NONE, parms, 2, _("Yes"), G_CALLBACK(_join_conference_cb), _("No"), G_CALLBACK(_reject_conference_cb));