Mercurial > pidgin.yaz

comparison src/protocols/msn/switchboard.c @ 9846:c28d5b45624e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10724] A patch from Nathan Fredrickson that should make Gaim not play sounds for people joining chats when you join chat. Um, his explanation is better: http://sourceforge.net/tracker/index.php?func=detail&aid=1008904&group_id=235&atid=300235 committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 24 Aug 2004 04:12:28 +0000
parents c001be3c330e
children 65b3156f9f48
comparison
equal deleted inserted replaced
9845:7c459857f1c2 9846:c28d5b45624e
66 /* gaim_debug_info("msn", "user=[%s], total=%d\n", user, 66 /* gaim_debug_info("msn", "user=[%s], total=%d\n", user,
67 * swboard->current_users); */ 67 * swboard->current_users); */
68 68
69 if ((swboard->conv != NULL) && (gaim_conversation_get_type(swboard->conv) == GAIM_CONV_CHAT)) 69 if ((swboard->conv != NULL) && (gaim_conversation_get_type(swboard->conv) == GAIM_CONV_CHAT))
70 { 70 {
71 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->conv), user, NULL, GAIM_CBFLAGS_NONE); 71 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->conv), user, NULL, GAIM_CBFLAGS_NONE, TRUE);
72 } 72 }
73 else if (swboard->current_users > 1 || swboard->total_users > 1) 73 else if (swboard->current_users > 1 || swboard->total_users > 1)
74 { 74 {
75 if (swboard->conv == NULL || 75 if (swboard->conv == NULL ||
76 gaim_conversation_get_type(swboard->conv) != GAIM_CONV_CHAT) 76 gaim_conversation_get_type(swboard->conv) != GAIM_CONV_CHAT)
97 97
98 /* gaim_debug_info("msn", "[chat] Adding [%s].\n", 98 /* gaim_debug_info("msn", "[chat] Adding [%s].\n",
99 * tmp_user); */ 99 * tmp_user); */
100 100
101 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->conv), 101 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->conv),
102 tmp_user, NULL, GAIM_CBFLAGS_NONE); 102 tmp_user, NULL, GAIM_CBFLAGS_NONE, TRUE);
103 } 103 }
104 104
105 /* gaim_debug_info("msn", "[chat] We add ourselves.\n"); */ 105 /* gaim_debug_info("msn", "[chat] We add ourselves.\n"); */
106 106
107 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->conv), 107 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->conv),
108 gaim_account_get_username(account), 108 gaim_account_get_username(account),
109 NULL, GAIM_CBFLAGS_NONE); 109 NULL, GAIM_CBFLAGS_NONE, TRUE);
110 110
111 g_free(swboard->im_user); 111 g_free(swboard->im_user);
112 swboard->im_user = NULL; 112 swboard->im_user = NULL;
113 } 113 }
114 } 114 }