# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1126505067 0
# Node ID a26eb48d19530fd85df81579b70b20daccd805d4
# Parent  d41aabad3b7ab1d1aefd6ae57020a07707b8f90a
[gaim-migrate @ 13770]
I removed the GAIM_STATUS_ONLINE primitive.  Use GAIM_STATUS_AVAILABLE
instead.  If the primitive is not GAIM_STATUS_OFFLINE, then the user
is online and the primitive could be GAIM_STATUS_AVAILABLE,
GAIM_STATUS_AWAY, etc.

committer: Tailor Script <tailor@pidgin.im>

diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/gg/gg.c
--- a/src/protocols/gg/gg.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/gg/gg.c	Mon Sep 12 06:04:27 2005 +0000
@@ -1057,7 +1057,7 @@
 					       gaim_value_new(GAIM_TYPE_STRING), NULL);
 	types = g_list_append(types, type);
 
-	type = gaim_status_type_new_with_attrs(GAIM_STATUS_ONLINE, "online", _("Online"),
+	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE, "online", _("Online"),
 	                                       TRUE, TRUE, FALSE, "message", _("Message"),
 					       gaim_value_new(GAIM_TYPE_STRING), NULL);
 	types = g_list_append(types, type);
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/irc/irc.c
--- a/src/protocols/irc/irc.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/irc/irc.c	Mon Sep 12 06:04:27 2005 +0000
@@ -168,10 +168,6 @@
 								_("Offline"), FALSE);
 	types = g_list_append(types, type);
 
-	type = gaim_status_type_new(GAIM_STATUS_ONLINE, "online",
-								_("Online"), FALSE);
-	types = g_list_append(types, type);
-
 	type = gaim_status_type_new(GAIM_STATUS_AVAILABLE, "available",
 								_("Available"), TRUE);
 	types = g_list_append(types, type);
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/jabber/jabber.c
--- a/src/protocols/jabber/jabber.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/jabber/jabber.c	Mon Sep 12 06:04:27 2005 +0000
@@ -906,7 +906,7 @@
 	} else {
 		GaimStatusType *status_type = gaim_status_get_type(gaim_presence_get_active_status(gaim_buddy_get_presence(b)));
 
-		if(gaim_status_type_get_primitive(status_type) > GAIM_STATUS_ONLINE) {
+		if(gaim_status_type_get_primitive(status_type) > GAIM_STATUS_AVAILABLE) {
 			*se = gaim_status_type_get_id(status_type);
 			if(!strcmp(*se, "xa"))
 				*se = "extendedaway";
@@ -1005,12 +1005,6 @@
 			gaim_value_new(GAIM_TYPE_STRING), NULL);
 	types = g_list_append(types, type);
 
-	type = gaim_status_type_new_with_attrs(GAIM_STATUS_ONLINE, "online",
-			_("Online"), FALSE, TRUE, FALSE, "priority", _("Priority"),
-			gaim_value_new(GAIM_TYPE_INT), "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, "available",
 			_("Available"), TRUE, TRUE, FALSE, "priority", _("Priority"),
 			gaim_value_new(GAIM_TYPE_INT), "message", _("Message"),
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/msn/msn.c
--- a/src/protocols/msn/msn.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/msn/msn.c	Mon Sep 12 06:04:27 2005 +0000
@@ -569,10 +569,6 @@
 			"offline", _("Offline"), FALSE, FALSE, FALSE);
 	types = g_list_append(types, status);
 
-	status = gaim_status_type_new_full(GAIM_STATUS_ONLINE,
-			"online", _("Online"), FALSE, FALSE, FALSE);
-	types = g_list_append(types, status);
-
 	status = gaim_status_type_new_full(GAIM_STATUS_AVAILABLE,
 			"available", _("Available"), FALSE, TRUE, FALSE);
 	types = g_list_append(types, status);
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/napster/napster.c
--- a/src/protocols/napster/napster.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/napster/napster.c	Mon Sep 12 06:04:27 2005 +0000
@@ -574,7 +574,7 @@
 									 _("Offline"), TRUE, TRUE, FALSE);
 	types = g_list_append(types, type);
 
-	type = gaim_status_type_new_full(GAIM_STATUS_ONLINE,
+	type = gaim_status_type_new_full(GAIM_STATUS_AVAILABLE,
 									 "online",
 									 _("Online"), TRUE, TRUE, FALSE);
 	types = g_list_append(types, type);
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/novell/novell.c
--- a/src/protocols/novell/novell.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/novell/novell.c	Mon Sep 12 06:04:27 2005 +0000
@@ -2941,11 +2941,7 @@
 	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE, "offline", _("Offline"), FALSE, TRUE, FALSE);
 	status_types = g_list_append(status_types, type);
 
-	/* TODO: Do we need both an "online" and an "available" state? */
-	type = gaim_status_type_new_full(GAIM_STATUS_ONLINE, "online", _("Online"), FALSE, TRUE, FALSE);
-	status_types = g_list_append(status_types, type);
-
-	type = gaim_status_type_new_full(GAIM_STATUS_ONLINE, "available", _("Available"), TRUE, TRUE, TRUE);
+	type = gaim_status_type_new_full(GAIM_STATUS_AVAILABLE, "available", _("Available"), TRUE, TRUE, TRUE);
 	status_types = g_list_append(status_types, type);
 
 	type = gaim_status_type_new_full(GAIM_STATUS_AWAY, "away", _("Away"), TRUE, TRUE, TRUE);
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/oscar/oscar.c	Mon Sep 12 06:04:27 2005 +0000
@@ -49,7 +49,6 @@
 
 #define OSCAR_STATUS_ID_INVISIBLE	"invisible"
 #define OSCAR_STATUS_ID_OFFLINE		"offline"
-#define OSCAR_STATUS_ID_ONLINE		"online"
 #define OSCAR_STATUS_ID_AVAILABLE	"available"
 #define OSCAR_STATUS_ID_AWAY		"away"
 #define OSCAR_STATUS_ID_DND			"dnd"
@@ -6633,7 +6632,7 @@
 	if ((od->sess->ssi.received_data) && (aim_ssi_getpermdeny(od->sess->ssi.local) != account->perm_deny))
 		aim_ssi_setpermdeny(od->sess, account->perm_deny, 0xffffffff);
 
-	if (!strcmp(status_id, OSCAR_STATUS_ID_ONLINE) || !strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE))
+	if (!strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE) || !strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE))
 		aim_setextstatus(od->sess, AIM_ICQ_STATE_NORMAL);
 
 	else if (!strcmp(status_id, OSCAR_STATUS_ID_AWAY))
@@ -7762,11 +7761,6 @@
 									 _("Offline"), FALSE, TRUE, FALSE);
 	status_types = g_list_append(status_types, type);
 
-	type = gaim_status_type_new_full(GAIM_STATUS_ONLINE,
-									 OSCAR_STATUS_ID_ONLINE,
-									 _("Online"), FALSE, TRUE, FALSE);
-	status_types = g_list_append(status_types, type);
-
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE,
 										   OSCAR_STATUS_ID_AVAILABLE,
 										   _("Available"), TRUE, TRUE, FALSE,
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/sametime/sametime.c
--- a/src/protocols/sametime/sametime.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/sametime/sametime.c	Mon Sep 12 06:04:27 2005 +0000
@@ -88,7 +88,6 @@
 
 /* stages of conciousness */
 #define MW_STATE_OFFLINE  "offline"
-#define MW_STATE_ONLINE   "online"
 #define MW_STATE_ACTIVE   "available"
 #define MW_STATE_AWAY     "away"
 #define MW_STATE_BUSY     "busy"
@@ -2737,9 +2736,6 @@
 			      _("Offline"), TRUE);
   types = g_list_append(types, type);
 
-  type = gaim_status_type_new(GAIM_STATUS_ONLINE, MW_STATE_ONLINE,
-			      _("Online"), TRUE);
-
   type = gaim_status_type_new(GAIM_STATUS_AVAILABLE, MW_STATE_ACTIVE,
 			      _("Active"), TRUE);
   gaim_status_type_add_attr(type, MW_STATE_MESSAGE, _("Message"),
@@ -2762,20 +2758,6 @@
 }
 
 
-#if 0
-static GList *mw_prpl_away_states(GaimConnection *gc) {
-  GList *l = NULL;
-
-  l = g_list_append(l, MW_STATE_ACTIVE);
-  l = g_list_append(l, MW_STATE_AWAY);
-  l = g_list_append(l, MW_STATE_BUSY);
-  l = g_list_append(l, (char *) GAIM_AWAY_CUSTOM);
-
-  return l;
-}
-#endif
-
-
 static void conf_create_prompt_cancel(GaimBuddy *buddy,
 				      GaimRequestFields *fields) {
   ;
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/silc/buddy.c
--- a/src/protocols/silc/buddy.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/silc/buddy.c	Mon Sep 12 06:04:27 2005 +0000
@@ -963,7 +963,7 @@
 	gaim_blist_node_set_string((GaimBlistNode *)b, "public-key", filename);
 
 	/* Update online status */
-	gaim_prpl_got_user_status(gaim_buddy_get_account(r->b), gaim_buddy_get_name(r->b), SILCGAIM_STATUS_ID_ONLINE, NULL);
+	gaim_prpl_got_user_status(gaim_buddy_get_account(r->b), gaim_buddy_get_name(r->b), SILCGAIM_STATUS_ID_AVAILABLE, NULL);
 
 	/* Finally, start watching this user so we receive its status
 	   changes from the server */
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/silc/ops.c
--- a/src/protocols/silc/ops.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/silc/ops.c	Mon Sep 12 06:04:27 2005 +0000
@@ -710,7 +710,7 @@
 				     client_entry->mode & SILC_UMODE_PAGE ||
 				     client_entry->mode & SILC_UMODE_DETACHED)) {
 					client_entry->mode = mode;
-					gaim_prpl_got_user_status(gaim_buddy_get_account(b), gaim_buddy_get_name(b), SILCGAIM_STATUS_ID_ONLINE, NULL);
+					gaim_prpl_got_user_status(gaim_buddy_get_account(b), gaim_buddy_get_name(b), SILCGAIM_STATUS_ID_AVAILABLE, NULL);
 				}
 				else if ((mode & SILC_UMODE_GONE) ||
 					 (mode & SILC_UMODE_INDISPOSED) ||
@@ -727,7 +727,7 @@
 				gaim_prpl_got_user_status(gaim_buddy_get_account(b), gaim_buddy_get_name(b), SILCGAIM_STATUS_ID_OFFLINE, NULL);
 			} else if (notify == SILC_NOTIFY_TYPE_NONE) {
 				client_entry->mode = mode;
-				gaim_prpl_got_user_status(gaim_buddy_get_account(b), gaim_buddy_get_name(b), SILCGAIM_STATUS_ID_ONLINE, NULL);
+				gaim_prpl_got_user_status(gaim_buddy_get_account(b), gaim_buddy_get_name(b), SILCGAIM_STATUS_ID_AVAILABLE, NULL);
 			}
 		}
 		break;
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/silc/silc.c
--- a/src/protocols/silc/silc.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/silc/silc.c	Mon Sep 12 06:04:27 2005 +0000
@@ -45,8 +45,6 @@
 
 	type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE, SILCGAIM_STATUS_ID_OFFLINE, _("Offline"), FALSE, FALSE, FALSE);
 	types = g_list_append(types, type);
-	type = gaim_status_type_new_full(GAIM_STATUS_ONLINE, SILCGAIM_STATUS_ID_ONLINE, _("Online"), FALSE, FALSE, FALSE);
-	types = g_list_append(types, type);
 	type = gaim_status_type_new_full(GAIM_STATUS_AVAILABLE, SILCGAIM_STATUS_ID_AVAILABLE, _("Available"), 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);
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/silc/silcgaim.h
--- a/src/protocols/silc/silcgaim.h	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/silc/silcgaim.h	Mon Sep 12 06:04:27 2005 +0000
@@ -47,7 +47,6 @@
 
 /* Status IDs */
 #define SILCGAIM_STATUS_ID_OFFLINE	"offline"
-#define SILCGAIM_STATUS_ID_ONLINE	"online"
 #define SILCGAIM_STATUS_ID_AVAILABLE "available"
 #define SILCGAIM_STATUS_ID_HYPER	"hyper"
 #define SILCGAIM_STATUS_ID_AWAY		"away"
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/simple/simple.c
--- a/src/protocols/simple/simple.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/simple/simple.c	Mon Sep 12 06:04:27 2005 +0000
@@ -247,9 +247,6 @@
 	type = gaim_status_type_new(GAIM_STATUS_OFFLINE, "offline", _("Offline"), FALSE);
 	types = g_list_append(types, type);
 
-	type = gaim_status_type_new(GAIM_STATUS_ONLINE, "online", _("Online"), FALSE);
-	types = g_list_append(types, type);
-
 	type = gaim_status_type_new_with_attrs(
 		GAIM_STATUS_AVAILABLE, "available", _("Available"),
 		TRUE, TRUE, FALSE,
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/yahoo/yahoo.c	Mon Sep 12 06:04:27 2005 +0000
@@ -2462,7 +2462,7 @@
 	yd->confs = NULL;
 	yd->conf_id = 2;
 
-	if (!strcmp(id, YAHOO_STATUS_TYPE_AVAILABLE) || !strcmp(id, YAHOO_STATUS_TYPE_ONLINE)) {
+	if (!strcmp(id, YAHOO_STATUS_TYPE_AVAILABLE)) {
 		yd->current_status = YAHOO_STATUS_AVAILABLE;
 	} else if (!strcmp(id, YAHOO_STATUS_TYPE_BRB)) {
 		yd->current_status = YAHOO_STATUS_BRB;
@@ -3207,9 +3207,6 @@
 	type = gaim_status_type_new(GAIM_STATUS_OFFLINE, YAHOO_STATUS_TYPE_OFFLINE, _("Offline"), TRUE);
 	types = g_list_append(types, type);
 
-	type = gaim_status_type_new(GAIM_STATUS_ONLINE, YAHOO_STATUS_TYPE_ONLINE, _("Online"), TRUE);
-	types = g_list_append(types, type);
-
 	type = gaim_status_type_new(GAIM_STATUS_AVAILABLE, YAHOO_STATUS_TYPE_AVAILABLE, _("Available"), TRUE);
 	types = g_list_append(types, type);
 
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/yahoo/yahoo.h
--- a/src/protocols/yahoo/yahoo.h	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/yahoo/yahoo.h	Mon Sep 12 06:04:27 2005 +0000
@@ -53,7 +53,6 @@
 
 
 #define YAHOO_STATUS_TYPE_OFFLINE "offline"
-#define YAHOO_STATUS_TYPE_ONLINE "online"
 #define YAHOO_STATUS_TYPE_AVAILABLE "available"
 #define YAHOO_STATUS_TYPE_AVAILABLE_WM "available-wm"
 #define YAHOO_STATUS_TYPE_BRB "brb"
diff -r d41aabad3b7a -r a26eb48d1953 src/protocols/zephyr/zephyr.c
--- a/src/protocols/zephyr/zephyr.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/protocols/zephyr/zephyr.c	Mon Sep 12 06:04:27 2005 +0000
@@ -2249,7 +2249,7 @@
 	   Away won't change their exposure but will set an auto away message (for IMs only)
 	*/
 	
-	type = gaim_status_type_new(GAIM_STATUS_ONLINE, "online", _("Online"), FALSE);
+	type = gaim_status_type_new(GAIM_STATUS_AVAILABLE, "online", _("Online"), FALSE);
 	types = g_list_append(types,type);
 
 	type = gaim_status_type_new(GAIM_STATUS_HIDDEN, "hidden", _("Hidden"), FALSE);
diff -r d41aabad3b7a -r a26eb48d1953 src/status.c
--- a/src/status.c	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/status.c	Mon Sep 12 06:04:27 2005 +0000
@@ -152,7 +152,6 @@
 {
 	{ GAIM_STATUS_UNSET,           "unset",           N_("Unset")           },
 	{ GAIM_STATUS_OFFLINE,         "offline",         N_("Offline")         },
-	{ GAIM_STATUS_ONLINE,          "online",          N_("Online")          },
 	{ GAIM_STATUS_AVAILABLE,       "available",       N_("Available")       },
 	{ GAIM_STATUS_UNAVAILABLE,     "unavailable",     N_("Unavailable")     },
 	{ GAIM_STATUS_HIDDEN,          "hidden",          N_("Hidden")          },
diff -r d41aabad3b7a -r a26eb48d1953 src/status.h
--- a/src/status.h	Mon Sep 12 05:44:03 2005 +0000
+++ b/src/status.h	Mon Sep 12 06:04:27 2005 +0000
@@ -98,7 +98,6 @@
 {
 	GAIM_STATUS_UNSET = 0,
 	GAIM_STATUS_OFFLINE,
-	GAIM_STATUS_ONLINE,
 	GAIM_STATUS_AVAILABLE,
 	GAIM_STATUS_UNAVAILABLE,
 	GAIM_STATUS_HIDDEN,