Mercurial > pidgin
changeset 18300:9171c96ab475
merge of '957d8b98b97eb5f2d3f58208e8ad28a55f3f81b8'
and 'f4ded9af5084e9c7c677eeede3544c679323adfd'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 26 Jun 2007 21:09:22 +0000 |
| parents | 73b3da7608f5 (diff) ba67200a69d1 (current diff) |
| children | f8f726b74b5c |
| files | |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Tue Jun 26 19:55:22 2007 +0000 +++ b/pidgin/gtkconv.c Tue Jun 26 21:09:22 2007 +0000 @@ -541,13 +541,6 @@ account = purple_conversation_get_account(conv); - if (!purple_account_is_connected(account)) - return; - - if ((purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) && - purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) - return; - if (check_for_and_do_command(conv)) { if (gtkconv->entry_growing) { reset_default_size(gtkconv); @@ -557,6 +550,13 @@ return; } + if ((purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) && + purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) + return; + + if (!purple_account_is_connected(account)) + return; + buf = gtk_imhtml_get_markup(GTK_IMHTML(gtkconv->entry)); clean = gtk_imhtml_get_text(GTK_IMHTML(gtkconv->entry), NULL, NULL);