comparison src/protocols/novell/novell.c @ 11338:17142948653e

[gaim-migrate @ 13551] Change the GAIM_CONV_IM and GAIM_CONV_CHAT enums to GAIM_CONV_TYPE_IM and GAIM_CONV_TYPE_CHAT. This touched A LOT of files. Also combined two oscar header files (one of them was small and dorky). committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 25 Aug 2005 02:33:44 +0000
parents 90be432e8385
children a26eb48d1953
comparison
equal deleted inserted replaced
11337:1462b64f8fc9 11338:17142948653e
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 /* XXX - Should this be GAIM_CONV_IM? */ 197 /* XXX - Should this be GAIM_CONV_TYPE_IM? */
198 gconv = gaim_find_conversation_with_account(GAIM_CONV_ANY, 198 gconv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY,
199 nm_user_record_get_display_id(user_record), 199 nm_user_record_get_display_id(user_record),
200 (GaimAccount *) user->client_data); 200 (GaimAccount *) user->client_data);
201 if (gconv) { 201 if (gconv) {
202 202
203 dn = nm_user_record_get_dn(user_record); 203 dn = nm_user_record_get_dn(user_record);
1760 serv_got_im(gaim_account_get_connection(user->client_data), 1760 serv_got_im(gaim_account_get_connection(user->client_data),
1761 nm_user_record_get_display_id(user_record), 1761 nm_user_record_get_display_id(user_record),
1762 text, imflags, 1762 text, imflags,
1763 nm_event_get_gmt(event)); 1763 nm_event_get_gmt(event));
1764 1764
1765 gconv = gaim_find_conversation_with_account(GAIM_CONV_IM, 1765 gconv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM,
1766 nm_user_record_get_display_id(user_record), 1766 nm_user_record_get_display_id(user_record),
1767 (GaimAccount *) user->client_data); 1767 (GaimAccount *) user->client_data);
1768 if (gconv) { 1768 if (gconv) {
1769 1769
1770 contact = nm_find_contact(user, nm_event_get_source(event)); 1770 contact = nm_find_contact(user, nm_event_get_source(event));
2036 GaimConversation *gconv; 2036 GaimConversation *gconv;
2037 char *str; 2037 char *str;
2038 2038
2039 ur = nm_find_user_record(user, nm_event_get_source(event)); 2039 ur = nm_find_user_record(user, nm_event_get_source(event));
2040 if (ur) { 2040 if (ur) {
2041 /* XXX - Should this be GAIM_CONV_IM? */ 2041 /* XXX - Should this be GAIM_CONV_TYPE_IM? */
2042 gconv = 2042 gconv =
2043 gaim_find_conversation_with_account(GAIM_CONV_ANY, 2043 gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY,
2044 nm_user_record_get_display_id(ur), 2044 nm_user_record_get_display_id(ur),
2045 user->client_data); 2045 user->client_data);
2046 if (gconv) { 2046 if (gconv) {
2047 const char *name = nm_user_record_get_full_name(ur); 2047 const char *name = nm_user_record_get_full_name(ur);
2048 2048