comparison libpurple/protocols/jabber/message.c @ 25479:f35329c1094e

propagate from branch 'im.pidgin.pidgin' (head e1c76e1a6e09e3fb3697606e2d8f6b6327e7a7e9) to branch 'im.pidgin.pidgin.yaz' (head 63c9f47f9f122de5fb99e7b6b01916beb07cefeb)
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 05 May 2007 08:00:03 +0000
parents 096330f964b6 7c28e457563f
children 50a9c82d32a1
comparison
equal deleted inserted replaced
25478:f444605c27b6 25479:f35329c1094e
84 serv_got_typing(jm->js->gc, from, 0, PURPLE_TYPED); 84 serv_got_typing(jm->js->gc, from, 0, PURPLE_TYPED);
85 } else if(JM_STATE_GONE == jm->chat_state) { 85 } else if(JM_STATE_GONE == jm->chat_state) {
86 PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, 86 PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
87 from, jm->js->gc->account); 87 from, jm->js->gc->account);
88 if (conv && jid->node && jid->domain) { 88 if (conv && jid->node && jid->domain) {
89 #if 0 /* String freeze... make sure to mark the message for translation */
90 char buf[256]; 89 char buf[256];
91 PurpleBuddy *buddy; 90 PurpleBuddy *buddy;
92 91
93 g_snprintf(buf, sizeof(buf), "%s@%s", jid->node, jid->domain); 92 g_snprintf(buf, sizeof(buf), "%s@%s", jid->node, jid->domain);
94 93
98 97
99 who = purple_buddy_get_alias(buddy); 98 who = purple_buddy_get_alias(buddy);
100 escaped = g_markup_escape_text(who, -1); 99 escaped = g_markup_escape_text(who, -1);
101 100
102 g_snprintf(buf, sizeof(buf), 101 g_snprintf(buf, sizeof(buf),
103 "%s has left the conversation.", escaped); 102 _("%s has left the conversation."), escaped);
104 103
105 /* At some point when we restructure PurpleConversation, 104 /* At some point when we restructure PurpleConversation,
106 * this should be able to be implemented by removing the 105 * this should be able to be implemented by removing the
107 * user from the conversation like we do with chats now. */ 106 * user from the conversation like we do with chats now. */
108 purple_conversation_write(conv, "", buf, 107 purple_conversation_write(conv, "", buf,
109 PURPLE_MESSAGE_SYSTEM, time(NULL)); 108 PURPLE_MESSAGE_SYSTEM, time(NULL));
110 } 109 }
111 #endif
112 } 110 }
113 serv_got_typing_stopped(jm->js->gc, from); 111 serv_got_typing_stopped(jm->js->gc, from);
114 112
115 } else { 113 } else {
116 serv_got_typing_stopped(jm->js->gc, from); 114 serv_got_typing_stopped(jm->js->gc, from);