Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
10115:4fd312ceaa29 | 10116:9f358a718f38 |
---|---|
1892 parms = NULL; | 1892 parms = NULL; |
1893 parms = g_slist_append(parms, user); | 1893 parms = g_slist_append(parms, user); |
1894 parms = g_slist_append(parms, nm_event_get_conference(event)); | 1894 parms = g_slist_append(parms, nm_event_get_conference(event)); |
1895 | 1895 |
1896 /* Prompt the user */ | 1896 /* Prompt the user */ |
1897 gaim_request_action(NULL, title, primary, secondary, -1, parms, 2, | 1897 gaim_request_action(NULL, title, primary, secondary, |
1898 GAIM_DEFAULT_ACTION_NONE, parms, 2, | |
1898 _("Yes"), G_CALLBACK(_join_conference_cb), | 1899 _("Yes"), G_CALLBACK(_join_conference_cb), |
1899 _("No"), G_CALLBACK(_reject_conference_cb)); | 1900 _("No"), G_CALLBACK(_reject_conference_cb)); |
1900 | 1901 |
1901 g_free(primary); | 1902 g_free(primary); |
1902 } | 1903 } |