Mercurial > pidgin

comparison src/protocols/novell/novell.c @ 10246:a66cf83552dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 11386] I changed gaim_find_conversation and gaim_find_conversation_with_account The first parameter is now one of GAIM_CONV_IM, GAIM_CONV_CHAT or GAIM_CONV_ANY. Unfortunately, this changes a bajillion files. Please look over this and make sure I use the correct type everywhere. Especially in Novell and MSN, and somewhat in SILC. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 23 Nov 2004 06:14:15 +0000
parents 9f358a718f38
children 3e4ecbdf8d0a
comparison
equal deleted inserted replaced
10245:c143a3fac58d 10246:a66cf83552dc
192 if (ret_code == NM_OK) { 192 if (ret_code == NM_OK) {
193 user_record = (NMUserRecord *) resp_data; 193 user_record = (NMUserRecord *) resp_data;
194 if (user_record) { 194 if (user_record) {
195 195
196 /* Set the title for the conversation */ 196 /* Set the title for the conversation */
197 gconv = gaim_find_conversation_with_account(nm_user_record_get_display_id(user_record), 197 /* XXX - Should this be GAIM_CONV_IM? */
198 gconv = gaim_find_conversation_with_account(GAIM_CONV_ANY,
199 nm_user_record_get_display_id(user_record),
198 (GaimAccount *) user->client_data); 200 (GaimAccount *) user->client_data);
199 if (gconv) { 201 if (gconv) {
200 202
201 dn = nm_user_record_get_dn(user_record); 203 dn = nm_user_record_get_dn(user_record);
202 if (dn) { 204 if (dn) {
1758 serv_got_im(gaim_account_get_connection(user->client_data), 1760 serv_got_im(gaim_account_get_connection(user->client_data),
1759 nm_user_record_get_display_id(user_record), 1761 nm_user_record_get_display_id(user_record),
1760 text, imflags, 1762 text, imflags,
1761 nm_event_get_gmt(event)); 1763 nm_event_get_gmt(event));
1762 1764
1763 gconv = gaim_find_conversation_with_account( 1765 gconv = gaim_find_conversation_with_account(GAIM_CONV_IM,
1764 nm_user_record_get_display_id(user_record), 1766 nm_user_record_get_display_id(user_record),
1765 (GaimAccount *) user->client_data); 1767 (GaimAccount *) user->client_data);
1766 if (gconv) { 1768 if (gconv) {
1767 1769
1768 contact = nm_find_contact(user, nm_event_get_source(event)); 1770 contact = nm_find_contact(user, nm_event_get_source(event));
2032 GaimConversation *gconv; 2034 GaimConversation *gconv;
2033 char *str; 2035 char *str;
2034 2036
2035 ur = nm_find_user_record(user, nm_event_get_source(event)); 2037 ur = nm_find_user_record(user, nm_event_get_source(event));
2036 if (ur) { 2038 if (ur) {
2039 /* XXX - Should this be GAIM_CONV_IM? */
2037 gconv = 2040 gconv =
2038 gaim_find_conversation_with_account(nm_user_record_get_display_id(ur), 2041 gaim_find_conversation_with_account(GAIM_CONV_ANY,
2042 nm_user_record_get_display_id(ur),
2039 user->client_data); 2043 user->client_data);
2040 if (gconv) { 2044 if (gconv) {
2041 const char *name = nm_user_record_get_full_name(ur); 2045 const char *name = nm_user_record_get_full_name(ur);
2042 2046
2043 if (name == NULL) { 2047 if (name == NULL) {