# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1212451846 0
# Node ID 775994d4913664eb2a0451a64d2b0ca194ea1677
# Parent  e9dc6fdbf25701ba47e77ba42123380075a8e8dd# Parent  74f1a07f452be5981b69b1366cc6456dda38cee7
merge of '159777d1bbf9084c7e0f9e562bb47e7ab3638da7'
     and 'f2a934d118747fe777d8001932ddf481b872f948'

diff -r e9dc6fdbf257 -r 775994d49136 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Mon Jun 02 11:31:20 2008 +0000
+++ b/pidgin/gtkstatusbox.c	Tue Jun 03 00:10:46 2008 +0000
@@ -209,7 +209,8 @@
 	for (l = purple_account_get_status_types(account); l != NULL; l = l->next) {
 		PurpleStatusType *status_type = (PurpleStatusType *)l->data;
 
-		if (!purple_status_type_is_user_settable(status_type))
+		if (!purple_status_type_is_user_settable(status_type) ||
+				purple_status_type_is_independent(status_type))
 			continue;
 		status_no++;
 		if (statustype == status_type)
@@ -769,7 +770,8 @@
 
 	for (i = 0; l; l = l->next) {
 		PurpleStatusType *status_type = l->data;
-		if (!purple_status_type_is_user_settable(status_type))
+		if (!purple_status_type_is_user_settable(status_type) ||
+				purple_status_type_is_independent(status_type))
 			continue;
 
 		if (active == i)
@@ -1030,12 +1032,13 @@
 		PurpleStatusType *status_type = (PurpleStatusType *)l->data;
 		PurpleStatusPrimitive prim;
 
-		if (!purple_status_type_is_user_settable(status_type))
+		if (!purple_status_type_is_user_settable(status_type) ||
+				purple_status_type_is_independent(status_type))
 			continue;
 
-            	prim = purple_status_type_get_primitive(status_type);
-
-                pixbuf = pidgin_status_box_get_pixbuf(status_box, prim);
+		prim = purple_status_type_get_primitive(status_type);
+
+		pixbuf = pidgin_status_box_get_pixbuf(status_box, prim);
 
 		pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box),
 					PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf,