Mercurial > pidgin
comparison libpurple/conversation.c @ 22327:6fc8f0c825e0
Kill off some uses of account->gc.
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Fri, 22 Feb 2008 00:11:25 +0000 |
parents | edca47ee06c5 |
children | f75509f776cc |
comparison
equal
deleted
inserted
replaced
22323:42724bd41274 | 22327:6fc8f0c825e0 |
---|---|
207 static void | 207 static void |
208 add_message_to_history(PurpleConversation *conv, const char *who, const char *alias, | 208 add_message_to_history(PurpleConversation *conv, const char *who, const char *alias, |
209 const char *message, PurpleMessageFlags flags, time_t when) | 209 const char *message, PurpleMessageFlags flags, time_t when) |
210 { | 210 { |
211 PurpleConvMessage *msg; | 211 PurpleConvMessage *msg; |
212 PurpleConnection *gc; | |
213 | |
214 gc = purple_account_get_connection(conv->account); | |
212 | 215 |
213 if (flags & PURPLE_MESSAGE_SEND) { | 216 if (flags & PURPLE_MESSAGE_SEND) { |
214 const char *me = NULL; | 217 const char *me = NULL; |
215 if (conv->account->gc) | 218 if (gc) |
216 me = conv->account->gc->display_name; | 219 me = purple_connection_get_display_name(gc); |
217 if (!me) | 220 if (!me) |
218 me = conv->account->username; | 221 me = conv->account->username; |
219 who = me; | 222 who = me; |
220 } | 223 } |
221 | 224 |