changeset 31111:8b710369bd50

disapproval of revision '412a518af798eaeeea99651705fd9d549596b966' The status entry *is* useful when switching to an Offline status.
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sat, 08 Jan 2011 15:07:58 +0000
parents 5841cbbebc53
children 9f6b8e5998ec
files ChangeLog pidgin/gtkstatusbox.c
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Jan 08 06:39:45 2011 +0000
+++ b/ChangeLog	Sat Jan 08 15:07:58 2011 +0000
@@ -22,7 +22,6 @@
 	  the conversation window.  (Ryan Flegel) (#13127)
 	* Fix a few memory leaks. (Nader Morshed) (#13162)
 	* Support rendering strikethrough when received as in-line CSS. (#13168)
-	* Don't show the message entry when changing to Offline Status.
 
 	Plugins:
 	* The Voice/Video Settings plugin no longer resets selected devices to
--- a/pidgin/gtkstatusbox.c	Sat Jan 08 06:39:45 2011 +0000
+++ b/pidgin/gtkstatusbox.c	Sat Jan 08 15:07:58 2011 +0000
@@ -2659,8 +2659,7 @@
 		account = node->data;
 		status_type = purple_account_get_status_type_with_primitive(account, GPOINTER_TO_INT(data));
 		if ((status_type != NULL) &&
-			(purple_status_type_get_attr(status_type, "message") != NULL) &&
-			(purple_status_type_get_primitive(status_type) != PURPLE_STATUS_OFFLINE))
+			(purple_status_type_get_attr(status_type, "message") != NULL))
 		{
 			status_box->imhtml_visible = TRUE;
 			break;