Mercurial > pidgin

diff src/protocols/zephyr/zephyr.c @ 11638:3a05b53a589e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 13914] Some bits'n'pieces: A bunch of memory leak fixes Fix newly created accounts to connect in the currently active global status Fix the modify account dialog to only show relevant user options etc. Update sametime to use some more of the new status stuff, it still needs more love though. Some s/online/available/ for consistency across prpls Fix a racyness in disconnecting connections that want to die (fixes the Yahoo crash when signing on somewhere else) Sorry if I caused any conflicts! committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 10 Oct 2005 17:59:48 +0000
parents c9b815aeddc1
children fa742ad8068c
line wrap: on
line diff
--- a/src/protocols/zephyr/zephyr.c	Mon Oct 10 12:29:30 2005 +0000
+++ b/src/protocols/zephyr/zephyr.c	Mon Oct 10 17:59:48 2005 +0000
@@ -732,7 +732,7 @@
 				g_string_free(str, TRUE);
 			} else {
 				if (nlocs>0) 
-					gaim_prpl_got_user_status(gc->account,b->name,"online",NULL);
+					gaim_prpl_got_user_status(gc->account,b->name,"available",NULL);
 				else 
 					gaim_prpl_got_user_status(gc->account,b->name,"offline",NULL);
 			}
@@ -1147,7 +1147,7 @@
 					g_string_free(str, TRUE);
 				} else {
 					if (nlocs>0) 
-						gaim_prpl_got_user_status(gc->account,b->name,"online",NULL);
+						gaim_prpl_got_user_status(gc->account,b->name,"available",NULL);
 					else 
 						gaim_prpl_got_user_status(gc->account,b->name,"offline",NULL);
 				}
@@ -1286,7 +1286,7 @@
 							for(i=0;i<numlocs;i++) {
 								ZGetLocations(&locations,&one);
 								if (nlocs>0) 
-									gaim_prpl_got_user_status(gc->account,b->name,"online",NULL);
+									gaim_prpl_got_user_status(gc->account,b->name,"available",NULL);
 								else 
 									gaim_prpl_got_user_status(gc->account,b->name,"offline",NULL);
 							}
@@ -2208,7 +2208,7 @@
 	if (!strcmp(status_id,"away")) {
 		zephyr->away = g_strdup(gaim_status_get_attr_string(status,"message"));
 	} 
-	else if (!strcmp(status_id,"online")) {
+	else if (!strcmp(status_id,"available")) {
 		if (use_zeph02(zephyr)) {
 			ZSetLocation(zephyr->exposure);
 		}
@@ -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_AVAILABLE, "online", _("Online"), FALSE);
+	type = gaim_status_type_new(GAIM_STATUS_AVAILABLE, "available", _("Online"), FALSE);
 	types = g_list_append(types,type);
 
 	type = gaim_status_type_new(GAIM_STATUS_HIDDEN, "hidden", _("Hidden"), FALSE);