Mercurial > pidgin

comparison libpurple/protocols/irc/cmds.c @ 26987:cd78ea46e9bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '7c614b09b72037ebd86c03fbbeac7794a155547b' and 'af18689b86389686230fc6ce83cbba52690ce0cb'
author Paul Aurich <paul@darkrain42.org>
date Sat, 30 May 2009 00:32:50 +0000
parents 367570a961f0
children 91869ed3ba59
comparison
equal deleted inserted replaced
26986:42bff519973b 26987:cd78ea46e9bd
140 if (action[strlen(action) - 1] == '\n') 140 if (action[strlen(action) - 1] == '\n')
141 action[strlen(action) - 1] = '\0'; 141 action[strlen(action) - 1] = '\0';
142 if (purple_conversation_get_type(convo) == PURPLE_CONV_TYPE_CHAT) 142 if (purple_conversation_get_type(convo) == PURPLE_CONV_TYPE_CHAT)
143 serv_got_chat_in(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(convo)), 143 serv_got_chat_in(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(convo)),
144 purple_connection_get_display_name(gc), 144 purple_connection_get_display_name(gc),
145 0, action, time(NULL)); 145 PURPLE_MESSAGE_SEND, action, time(NULL));
146 else 146 else
147 purple_conv_im_write(PURPLE_CONV_IM(convo), purple_connection_get_display_name(gc), 147 purple_conv_im_write(PURPLE_CONV_IM(convo), purple_connection_get_display_name(gc),
148 action, 0, time(NULL)); 148 action, PURPLE_MESSAGE_SEND, time(NULL));
149 g_free(action); 149 g_free(action);
150 } 150 }
151 151
152 return 1; 152 return 1;
153 } 153 }