Mercurial > pidgin.yaz

comparison src/server.c @ 4476:62c1e5e656d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4751] gaim_conversation_new() now takes an aim_user parameter. This should fix the new placement grouping bugs, as the default "user" (account) selected was the first account in the list of connections. There may be side-effects, especially with perl plugins, but I'm not sure. Please report anything odd that you see as a result of this. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Thu, 30 Jan 2003 18:45:50 +0000
parents d9e4eacf6b46
children abb0c3eccc76
comparison
equal deleted inserted replaced
4475:1f3241831734 4476:62c1e5e656d0
731 * Ok, so we're not ignoring it. Make sure the conversation 731 * Ok, so we're not ignoring it. Make sure the conversation
732 * exists and is updated (partly handled above already), play 732 * exists and is updated (partly handled above already), play
733 * the receive sound (sound.c will take care of not playing 733 * the receive sound (sound.c will take care of not playing
734 * while away), and then write it to the convo window. 734 * while away), and then write it to the convo window.
735 */ 735 */
736 if (cnv == NULL) { 736 if (cnv == NULL)
737 cnv = gaim_conversation_new(GAIM_CONV_IM, name); 737 cnv = gaim_conversation_new(GAIM_CONV_IM, gc->user, name);
738 gaim_conversation_set_user(cnv, gc->user);
739 }
740 738
741 gaim_im_write(GAIM_IM(cnv), NULL, message, len, 739 gaim_im_write(GAIM_IM(cnv), NULL, message, len,
742 away | WFLAG_RECV, mtime); 740 away | WFLAG_RECV, mtime);
743 } 741 }
744 742
825 qm->tm = mtime; 823 qm->tm = mtime;
826 qm->flags = away | WFLAG_RECV; 824 qm->flags = away | WFLAG_RECV;
827 qm->len = len; 825 qm->len = len;
828 unread_message_queue = g_slist_append(unread_message_queue, qm); 826 unread_message_queue = g_slist_append(unread_message_queue, qm);
829 } else { 827 } else {
830 if (cnv == NULL) { 828 if (cnv == NULL)
831 cnv = gaim_conversation_new(GAIM_CONV_IM, name); 829 cnv = gaim_conversation_new(GAIM_CONV_IM, gc->user, name);
832 gaim_conversation_set_user(cnv, gc->user);
833 }
834 830
835 /* CONV XXX gaim_conversation_set_name(cnv, name); */ 831 /* CONV XXX gaim_conversation_set_name(cnv, name); */
836 832
837 gaim_im_write(GAIM_IM(cnv), NULL, message, len, 833 gaim_im_write(GAIM_IM(cnv), NULL, message, len,
838 away | WFLAG_RECV, mtime); 834 away | WFLAG_RECV, mtime);
1076 int id, char *name) 1072 int id, char *name)
1077 { 1073 {
1078 struct gaim_conversation *b; 1074 struct gaim_conversation *b;
1079 struct gaim_chat *chat; 1075 struct gaim_chat *chat;
1080 1076
1081 b = gaim_conversation_new(GAIM_CONV_CHAT, name); 1077 b = gaim_conversation_new(GAIM_CONV_CHAT, gc->user, name);
1082 chat = GAIM_CHAT(b); 1078 chat = GAIM_CHAT(b);
1083 1079
1084 gc->buddy_chats = g_slist_append(gc->buddy_chats, b); 1080 gc->buddy_chats = g_slist_append(gc->buddy_chats, b);
1085 1081
1086 gaim_chat_set_id(chat, id); 1082 gaim_chat_set_id(chat, id);
1087 gaim_conversation_set_user(b, gc->user); 1083
1088
1089 if ((logging_options & OPT_LOG_CHATS) || 1084 if ((logging_options & OPT_LOG_CHATS) ||
1090 find_log_info(gaim_conversation_get_name(b))) { 1085 find_log_info(gaim_conversation_get_name(b))) {
1091 1086
1092 FILE *fd; 1087 FILE *fd;
1093 char *filename; 1088 char *filename;