Mercurial > pidgin.yaz

diff src/protocols/oscar/oscar.c @ 12658:a0fd3ebcd6fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 15001] Move the offline status type after everything else for all protocols. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 25 Dec 2005 19:09:25 +0000
parents 2ef70289676c
children e265e2eac9e1
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c	Sun Dec 25 18:52:49 2005 +0000
+++ b/src/protocols/oscar/oscar.c	Sun Dec 25 19:09:25 2005 +0000
@@ -7841,11 +7841,6 @@
 	g_return_val_if_fail(account != NULL, NULL);
 
 	/* Oscar-common status types */
-	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE,
-									 OSCAR_STATUS_ID_OFFLINE,
-									 NULL, TRUE, TRUE, FALSE);
-	status_types = g_list_append(status_types, type);
-
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE,
 										   OSCAR_STATUS_ID_AVAILABLE,
 										   NULL, TRUE, TRUE, FALSE,
@@ -7865,29 +7860,33 @@
 									 NULL, TRUE, TRUE, FALSE);
 	status_types = g_list_append(status_types, type);
 
-	if (aim_sn_is_icq(gaim_account_get_username(account)) == FALSE )
-		return status_types;
-
 	/* ICQ-specific status types */
-
-	type = gaim_status_type_new_full(GAIM_STATUS_AVAILABLE,
-									 OSCAR_STATUS_ID_FREE4CHAT,
-									 _("Free For Chat"), TRUE, TRUE, FALSE);
-	status_types = g_list_append(status_types, type);
-
-	type = gaim_status_type_new_full(GAIM_STATUS_UNAVAILABLE,
-									 OSCAR_STATUS_ID_OCCUPIED,
-									 _("Occupied"), TRUE, TRUE, FALSE);
-	status_types = g_list_append(status_types, type);
-
-	type = gaim_status_type_new_full(GAIM_STATUS_EXTENDED_AWAY,
-									 OSCAR_STATUS_ID_DND,
-									 _("Do Not Disturb"), TRUE, TRUE, FALSE);
-	status_types = g_list_append(status_types, type);
-
-	type = gaim_status_type_new_full(GAIM_STATUS_EXTENDED_AWAY,
-									 OSCAR_STATUS_ID_NA,
-									 _("Not Available"), TRUE, TRUE, FALSE);
+	if (aim_sn_is_icq(gaim_account_get_username(account)))
+	{
+		type = gaim_status_type_new_full(GAIM_STATUS_AVAILABLE,
+										 OSCAR_STATUS_ID_FREE4CHAT,
+										 _("Free For Chat"), TRUE, TRUE, FALSE);
+		status_types = g_list_append(status_types, type);
+
+		type = gaim_status_type_new_full(GAIM_STATUS_UNAVAILABLE,
+										 OSCAR_STATUS_ID_OCCUPIED,
+										 _("Occupied"), TRUE, TRUE, FALSE);
+		status_types = g_list_append(status_types, type);
+
+		type = gaim_status_type_new_full(GAIM_STATUS_EXTENDED_AWAY,
+										 OSCAR_STATUS_ID_DND,
+										 _("Do Not Disturb"), TRUE, TRUE, FALSE);
+		status_types = g_list_append(status_types, type);
+
+		type = gaim_status_type_new_full(GAIM_STATUS_EXTENDED_AWAY,
+										 OSCAR_STATUS_ID_NA,
+										 _("Not Available"), TRUE, TRUE, FALSE);
+		status_types = g_list_append(status_types, type);
+	}
+
+	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE,
+									 OSCAR_STATUS_ID_OFFLINE,
+									 NULL, TRUE, TRUE, FALSE);
 	status_types = g_list_append(status_types, type);
 
 	return status_types;