Mercurial > pidgin

changeset 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 7b816173e2c6
children 4c50dd655c30
files src/protocols/bonjour/bonjour.c src/protocols/gg/gg.c src/protocols/irc/irc.c src/protocols/jabber/jabber.c src/protocols/msn/msn.c src/protocols/napster/napster.c src/protocols/novell/novell.c src/protocols/oscar/im.c src/protocols/oscar/oscar.c src/protocols/sametime/sametime.c src/protocols/silc/silc.c src/protocols/yahoo/yahoo.c src/protocols/zephyr/zephyr.c
diffstat 13 files changed, 75 insertions(+), 73 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/bonjour/bonjour.c	Sun Dec 25 18:52:49 2005 +0000
+++ b/src/protocols/bonjour/bonjour.c	Sun Dec 25 19:09:25 2005 +0000
@@ -241,11 +241,6 @@
 
 	g_return_val_if_fail(account != NULL, NULL);
 
-	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE,
-									 BONJOUR_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,
 										   BONJOUR_STATUS_ID_AVAILABLE,
 										   NULL, TRUE, TRUE, FALSE,
@@ -260,6 +255,11 @@
 										   gaim_value_new(GAIM_TYPE_STRING), NULL);
 	status_types = g_list_append(status_types, type);
 
+	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE,
+									 BONJOUR_STATUS_ID_OFFLINE,
+									 NULL, TRUE, TRUE, FALSE);
+	status_types = g_list_append(status_types, type);
+
 	return status_types;
 }
 
--- a/src/protocols/gg/gg.c	Sun Dec 25 18:52:49 2005 +0000
+++ b/src/protocols/gg/gg.c	Sun Dec 25 19:09:25 2005 +0000
@@ -1425,12 +1425,6 @@
 	GList *types = NULL;
 
 	type = gaim_status_type_new_with_attrs(
-			GAIM_STATUS_OFFLINE, NULL, NULL, TRUE, TRUE, FALSE,
-			"message", _("Message"), gaim_value_new(GAIM_TYPE_STRING),
-			NULL);
-	types = g_list_append(types, type);
-
-	type = gaim_status_type_new_with_attrs(
 			GAIM_STATUS_AVAILABLE, NULL, NULL, TRUE, TRUE, FALSE,
 			"message", _("Message"), gaim_value_new(GAIM_TYPE_STRING),
 			NULL);
@@ -1459,6 +1453,12 @@
 			"message", _("Message"), gaim_value_new(GAIM_TYPE_STRING), NULL);
 	types = g_list_append(types, type);
 
+	type = gaim_status_type_new_with_attrs(
+			GAIM_STATUS_OFFLINE, NULL, NULL, TRUE, TRUE, FALSE,
+			"message", _("Message"), gaim_value_new(GAIM_TYPE_STRING),
+			NULL);
+	types = g_list_append(types, type);
+
 	return types;
 }
 /* }}} */
--- a/src/protocols/irc/irc.c	Sun Dec 25 18:52:49 2005 +0000
+++ b/src/protocols/irc/irc.c	Sun Dec 25 19:09:25 2005 +0000
@@ -163,9 +163,6 @@
 	GaimStatusType *type;
 	GList *types = NULL;
 
-	type = gaim_status_type_new(GAIM_STATUS_OFFLINE, NULL, NULL, TRUE);
-	types = g_list_append(types, type);
-
 	type = gaim_status_type_new(GAIM_STATUS_AVAILABLE, NULL, NULL, TRUE);
 	types = g_list_append(types, type);
 
@@ -175,6 +172,9 @@
 		NULL);
 	types = g_list_append(types, type);
 
+	type = gaim_status_type_new(GAIM_STATUS_OFFLINE, NULL, NULL, TRUE);
+	types = g_list_append(types, type);
+
 	return types;
 }
 
--- a/src/protocols/jabber/jabber.c	Sun Dec 25 18:52:49 2005 +0000
+++ b/src/protocols/jabber/jabber.c	Sun Dec 25 19:09:25 2005 +0000
@@ -1082,13 +1082,6 @@
 	GList *types = NULL;
 	GaimValue *priority_value;
 
-	type = gaim_status_type_new_with_attrs(GAIM_STATUS_OFFLINE,
-			jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_UNAVAILABLE),
-			NULL, FALSE, TRUE, FALSE,
-			"message", _("Message"), gaim_value_new(GAIM_TYPE_STRING),
-			NULL);
-	types = g_list_append(types, type);
-
 	priority_value = gaim_value_new(GAIM_TYPE_INT);
 	gaim_value_set_int(priority_value, 1);
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE,
@@ -1144,6 +1137,13 @@
 		m = g_list_append(m, _("Invisible"));
 	*/
 
+	type = gaim_status_type_new_with_attrs(GAIM_STATUS_OFFLINE,
+			jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_UNAVAILABLE),
+			NULL, FALSE, TRUE, FALSE,
+			"message", _("Message"), gaim_value_new(GAIM_TYPE_STRING),
+			NULL);
+	types = g_list_append(types, type);
+
 	return types;
 }
 
--- a/src/protocols/msn/msn.c	Sun Dec 25 18:52:49 2005 +0000
+++ b/src/protocols/msn/msn.c	Sun Dec 25 19:09:25 2005 +0000
@@ -573,10 +573,6 @@
 	GaimStatusType *status;
 	GList *types = NULL;
 
-	status = gaim_status_type_new_full(GAIM_STATUS_OFFLINE,
-			NULL, NULL, FALSE, TRUE, FALSE);
-	types = g_list_append(types, status);
-
 	status = gaim_status_type_new_full(GAIM_STATUS_AVAILABLE,
 			NULL, NULL, FALSE, TRUE, FALSE);
 	types = g_list_append(types, status);
@@ -605,6 +601,10 @@
 			NULL, NULL, FALSE, TRUE, FALSE);
 	types = g_list_append(types, status);
 
+	status = gaim_status_type_new_full(GAIM_STATUS_OFFLINE,
+			NULL, NULL, FALSE, TRUE, FALSE);
+	types = g_list_append(types, status);
+
 	return types;
 }
 
--- a/src/protocols/napster/napster.c	Sun Dec 25 18:52:49 2005 +0000
+++ b/src/protocols/napster/napster.c	Sun Dec 25 19:09:25 2005 +0000
@@ -574,11 +574,11 @@
 
 	g_return_val_if_fail(account != NULL, NULL);
 
-	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE,
+	type = gaim_status_type_new_full(GAIM_STATUS_AVAILABLE,
 									 NULL, NULL, TRUE, TRUE, FALSE);
 	types = g_list_append(types, type);
 
-	type = gaim_status_type_new_full(GAIM_STATUS_AVAILABLE,
+	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE,
 									 NULL, NULL, TRUE, TRUE, FALSE);
 	types = g_list_append(types, type);
 
--- a/src/protocols/novell/novell.c	Sun Dec 25 18:52:49 2005 +0000
+++ b/src/protocols/novell/novell.c	Sun Dec 25 19:09:25 2005 +0000
@@ -2972,9 +2972,6 @@
 
 	g_return_val_if_fail(account != NULL, NULL);
 
-	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE, NULL, NULL, FALSE, TRUE, FALSE);
-	status_types = g_list_append(status_types, type);
-
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE, NOVELL_STATUS_TYPE_AVAILABLE,
 										   NULL, TRUE, TRUE, FALSE,
 										   "message", _("Message"), gaim_value_new(GAIM_TYPE_STRING),
@@ -2997,6 +2994,9 @@
 										   NULL, TRUE, TRUE, FALSE);
 	status_types = g_list_append(status_types, type);
 
+	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE, NULL, NULL, FALSE, TRUE, FALSE);
+	status_types = g_list_append(status_types, type);
+
 	return status_types;
 }
 
--- a/src/protocols/oscar/im.c	Sun Dec 25 18:52:49 2005 +0000
+++ b/src/protocols/oscar/im.c	Sun Dec 25 19:09:25 2005 +0000
@@ -1024,10 +1024,10 @@
 		aimbs_put16(&fr->data, 0x0036);
 		{ /* V */
 			aimbs_putle16(&fr->data, 0x001b); /* L */
-			aimbs_putle16(&fr->data, 0x0008); /* XXX - Protocol version */
+			aimbs_putle16(&fr->data, 0x0009); /* Protocol version */
 			aimbs_putcaps(&fr->data, AIM_CAPS_EMPTY);
 			aimbs_putle16(&fr->data, 0x0000); /* Unknown */
-			aimbs_putle16(&fr->data, 0x0003); /* Client features? */
+			aimbs_putle16(&fr->data, 0x0001); /* Client features? */
 			aimbs_putle16(&fr->data, 0x0000); /* Unknown */
 			aimbs_putle8(&fr->data, 0x00); /* Unkizown */
 			aimbs_putle16(&fr->data, 0xffff); /* Sequence number?  XXX - This should decrement by 1 with each request */
@@ -1050,7 +1050,7 @@
 			else if(type & AIM_ICQ_STATE_AWAY)
 				aimbs_putle16(&fr->data, 0x03e8);
 
-			aimbs_putle16(&fr->data, 0x0000); /* Status? */
+			aimbs_putle16(&fr->data, 0x0001); /* Status? */
 			aimbs_putle16(&fr->data, 0x0001); /* Priority of this message? */
 			aimbs_putle16(&fr->data, 0x0001); /* L */
 			aimbs_putle8(&fr->data, 0x00); /* String of length L */
--- 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;
--- a/src/protocols/sametime/sametime.c	Sun Dec 25 18:52:49 2005 +0000
+++ b/src/protocols/sametime/sametime.c	Sun Dec 25 19:09:25 2005 +0000
@@ -3229,10 +3229,6 @@
   GList *types = NULL;
   GaimStatusType *type;
 
-  type = gaim_status_type_new(GAIM_STATUS_OFFLINE, MW_STATE_OFFLINE,
-			      NULL, TRUE);
-  types = g_list_append(types, type);
-
   type = gaim_status_type_new(GAIM_STATUS_AVAILABLE, MW_STATE_ACTIVE,
 			      _("Active"), TRUE);
   gaim_status_type_add_attr(type, MW_STATE_MESSAGE, _("Message"),
@@ -3251,6 +3247,10 @@
 			    gaim_value_new(GAIM_TYPE_STRING));
   types = g_list_append(types, type);
   
+  type = gaim_status_type_new(GAIM_STATUS_OFFLINE, MW_STATE_OFFLINE,
+			      NULL, TRUE);
+  types = g_list_append(types, type);
+
   return types;
 }
 
--- a/src/protocols/silc/silc.c	Sun Dec 25 18:52:49 2005 +0000
+++ b/src/protocols/silc/silc.c	Sun Dec 25 19:09:25 2005 +0000
@@ -44,8 +44,6 @@
 	GaimStatusType *type;
 	GList *types = NULL;
 
-	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE, SILCGAIM_STATUS_ID_OFFLINE, NULL, FALSE, TRUE, FALSE);
-	types = g_list_append(types, type);
 	type = gaim_status_type_new_full(GAIM_STATUS_AVAILABLE, SILCGAIM_STATUS_ID_AVAILABLE, NULL, FALSE, TRUE, FALSE);
 	types = g_list_append(types, type);
 	type = gaim_status_type_new_full(GAIM_STATUS_AVAILABLE, SILCGAIM_STATUS_ID_HYPER, _("Hyper Active"), FALSE, TRUE, FALSE);
@@ -58,6 +56,8 @@
 	types = g_list_append(types, type);
 	type = gaim_status_type_new_full(GAIM_STATUS_AWAY, SILCGAIM_STATUS_ID_PAGE, _("Wake Me Up"), FALSE, TRUE, FALSE);
 	types = g_list_append(types, type);
+	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE, SILCGAIM_STATUS_ID_OFFLINE, NULL, FALSE, TRUE, FALSE);
+	types = g_list_append(types, type);
 
 	return types;
 }
--- a/src/protocols/yahoo/yahoo.c	Sun Dec 25 18:52:49 2005 +0000
+++ b/src/protocols/yahoo/yahoo.c	Sun Dec 25 19:09:25 2005 +0000
@@ -3199,9 +3199,6 @@
 	GaimStatusType *type;
 	GList *types = NULL;
 
-	type = gaim_status_type_new(GAIM_STATUS_OFFLINE, YAHOO_STATUS_TYPE_OFFLINE, NULL, TRUE);
-	types = g_list_append(types, type);
-
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE, YAHOO_STATUS_TYPE_AVAILABLE,
 	                                       NULL, TRUE, TRUE, FALSE,
 	                                       "message", _("Message"),
@@ -3245,6 +3242,9 @@
 	type = gaim_status_type_new(GAIM_STATUS_INVISIBLE, YAHOO_STATUS_TYPE_INVISIBLE, NULL, TRUE);
 	types = g_list_append(types, type);
 
+	type = gaim_status_type_new(GAIM_STATUS_OFFLINE, YAHOO_STATUS_TYPE_OFFLINE, NULL, TRUE);
+	types = g_list_append(types, type);
+
 	return types;
 }
 
--- a/src/protocols/zephyr/zephyr.c	Sun Dec 25 18:52:49 2005 +0000
+++ b/src/protocols/zephyr/zephyr.c	Sun Dec 25 19:09:25 2005 +0000
@@ -2243,17 +2243,17 @@
 	   REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
 	   NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
 	   NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-	   
+
 	   Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
 	   Hidden, will set the user's exposure to OPSTAFF
 
 	   Away won't change their exposure but will set an auto away message (for IMs only)
 	*/
-	
-	type = gaim_status_type_new(GAIM_STATUS_AVAILABLE, NULL, NULL, FALSE);
+
+	type = gaim_status_type_new(GAIM_STATUS_AVAILABLE, NULL, NULL, TRUE);
 	types = g_list_append(types,type);
 
-	type = gaim_status_type_new(GAIM_STATUS_INVISIBLE, NULL, NULL, FALSE);
+	type = gaim_status_type_new(GAIM_STATUS_INVISIBLE, NULL, NULL, TRUE);
 	types = g_list_append(types,type);
 
 	type = gaim_status_type_new_with_attrs(
@@ -2262,6 +2262,9 @@
 					       NULL);
 	types = g_list_append(types, type);
 
+	type = gaim_status_type_new(GAIM_STATUS_OFFLINE, NULL, NULL, TRUE);
+	types = g_list_append(types,type);
+
 	return types;
 }