Mercurial > pidgin.yaz

changeset 9984:e4a032202d49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10895] Ok it compiles. Mind you, I didn't test it yet. Setting your status should work, but I #if 0'd out the code for setting your idle time. I also #if 0'd out an idle related thing in yahoo_profile.c that I'm hoping wing will fix for me. committer: Tailor Script <tailor@pidgin.im>
author Tim Ringenbach <marv@pidgin.im>
date Wed, 08 Sep 2004 06:07:01 +0000
parents 7286c1483ceb
children 8cc2866678f3
files src/protocols/yahoo/yahoo.c src/protocols/yahoo/yahoo_profile.c
diffstat 2 files changed, 56 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo.c	Wed Sep 08 05:31:09 2004 +0000
+++ b/src/protocols/yahoo/yahoo.c	Wed Sep 08 06:07:01 2004 +0000
@@ -2949,61 +2949,56 @@
 	return 0;
 }
 
-static void yahoo_set_away(GaimConnection *gc, const char *state, const char *msg)
+static void yahoo_set_status(GaimAccount *account, GaimStatus *status)
 {
+	GaimConnection *gc = gaim_account_get_connection(account);
 	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;
 	struct yahoo_packet *pkt;
 	int service;
 	char s[4];
+	const char *id;
 	char *conv_msg = NULL;
 	char *conv_msg2 = NULL;
-
-	if (gc->away) {
-		g_free(gc->away);
-		gc->away = NULL;
-	}
-
-	if (msg) {
+	gboolean away = FALSE; /* only for YAHOO_STATUS_CUSTOM */
+
+	id = gaim_status_get_id(status);
+
+	if (!strcmp(id, "available")) {
+		yd->current_status = YAHOO_STATUS_AVAILABLE;
+	} else if (!strcmp(id, "berightback")) {
+		yd->current_status = YAHOO_STATUS_BRB;
+	} else if (!strcmp(id, "busy")) {
+		yd->current_status = YAHOO_STATUS_BUSY;
+	} else if (!strcmp(id, "notathome")) {
+		yd->current_status = YAHOO_STATUS_NOTATHOME;
+	} else if (!strcmp(id,"notatdesk")) {
+		yd->current_status = YAHOO_STATUS_NOTATDESK;
+	} else if (!strcmp(id, "notinoffice")) {
+		yd->current_status = YAHOO_STATUS_NOTINOFFICE;
+	} else if (!strcmp(id, "onthephone")) {
+		yd->current_status = YAHOO_STATUS_ONPHONE;
+	} else if (!strcmp(id, "onvacation")) {
+		yd->current_status = YAHOO_STATUS_ONVACATION;
+	} else if (!strcmp(id, "outtolunch")) {
+		yd->current_status = YAHOO_STATUS_OUTTOLUNCH;
+	} else if (!strcmp(id, "steppedout")) {
+		yd->current_status = YAHOO_STATUS_STEPPEDOUT;
+	} else if (!strcmp(id, "invisible")) {
+		yd->current_status = YAHOO_STATUS_INVISIBLE;
+	} else if (!strcmp(id, "away")) {
 		yd->current_status = YAHOO_STATUS_CUSTOM;
-		gc->away = g_strndup(msg, YAHOO_MAX_STATUS_MESSAGE_LENGTH);
-	} else if (state) {
-		gc->away = g_strdup("");
-		if (!strcmp(state, _("Available"))) {
-			yd->current_status = YAHOO_STATUS_AVAILABLE;
-		} else if (!strcmp(state, _("Be Right Back"))) {
-			yd->current_status = YAHOO_STATUS_BRB;
-		} else if (!strcmp(state, _("Busy"))) {
-			yd->current_status = YAHOO_STATUS_BUSY;
-		} else if (!strcmp(state, _("Not At Home"))) {
-			yd->current_status = YAHOO_STATUS_NOTATHOME;
-		} else if (!strcmp(state, _("Not At Desk"))) {
-			yd->current_status = YAHOO_STATUS_NOTATDESK;
-		} else if (!strcmp(state, _("Not In Office"))) {
-			yd->current_status = YAHOO_STATUS_NOTINOFFICE;
-		} else if (!strcmp(state, _("On The Phone"))) {
-			yd->current_status = YAHOO_STATUS_ONPHONE;
-		} else if (!strcmp(state, _("On Vacation"))) {
-			yd->current_status = YAHOO_STATUS_ONVACATION;
-		} else if (!strcmp(state, _("Out To Lunch"))) {
-			yd->current_status = YAHOO_STATUS_OUTTOLUNCH;
-		} else if (!strcmp(state, _("Stepped Out"))) {
-			yd->current_status = YAHOO_STATUS_STEPPEDOUT;
-		} else if (!strcmp(state, _("Invisible"))) {
-			yd->current_status = YAHOO_STATUS_INVISIBLE;
-		} else if (!strcmp(state, GAIM_AWAY_CUSTOM)) { /* this should never happen? */
-			if (gc->is_idle) {
-				yd->current_status = YAHOO_STATUS_IDLE;
-			} else {
-				yd->current_status = YAHOO_STATUS_AVAILABLE;
-			}
-		}
-	} else if (gc->is_idle) {
+		away = TRUE;
+	} else if (!strcmp(id, "avaiablewm")) {
+		yd->current_status = YAHOO_STATUS_CUSTOM;
+		away = FALSE;
+	} else if (gc->is_idle) { /* i think this is broken */
 		yd->current_status = YAHOO_STATUS_IDLE;
 	} else {
 		yd->current_status = YAHOO_STATUS_AVAILABLE;
 	}
 
-	if (yd->current_status == YAHOO_STATUS_AVAILABLE)
+	if (yd->current_status == YAHOO_STATUS_AVAILABLE ||
+	   ((yd->current_status == YAHOO_STATUS_CUSTOM) && !away))
 		service = YAHOO_SERVICE_ISBACK;
 	else
 		service = YAHOO_SERVICE_ISAWAY;
@@ -3012,30 +3007,33 @@
 	g_snprintf(s, sizeof(s), "%d", yd->current_status);
 	yahoo_packet_hash(pkt, 10, s);
 
-	if ((yd->current_status == YAHOO_STATUS_CUSTOM) && gc->away) {
-		conv_msg = yahoo_string_encode(gc, gc->away, NULL);
-		conv_msg2 = gaim_unescape_html(conv_msg);
+	if (yd->current_status == YAHOO_STATUS_CUSTOM) {
+		const char *msg = gaim_status_get_attr_string(status, "message");
+		conv_msg = yahoo_string_encode(gc, msg, NULL);
+		conv_msg2 = gaim_markup_strip_html(conv_msg);
 		yahoo_packet_hash(pkt, 19, conv_msg2);
-	}
-
-	if ((yd->current_status != YAHOO_STATUS_AVAILABLE) &&
-	    (yd->current_status != YAHOO_STATUS_IDLE)) {
+
 		if (gc->is_idle)
 			yahoo_packet_hash(pkt, 47, "2");
+		else if (away)
+			yahoo_packet_hash(pkt, 47, "1");
 		else
-			yahoo_packet_hash(pkt, 47, "1");
+			yahoo_packet_hash(pkt, 47, "0");
+	} else if (gc->is_idle) {
+		yahoo_packet_hash(pkt, 47, "2");
 	}
 
 	yahoo_send_packet(yd, pkt);
 	yahoo_packet_free(pkt);
-	if (conv_msg)
-		g_free(conv_msg);
-	if (conv_msg2)
-		g_free(conv_msg2);
+
+	g_free(conv_msg);
+	g_free(conv_msg2);
 }
 
 static void yahoo_set_idle(GaimConnection *gc, int idle)
 {
+#if 0
+/* this is complicated, since it interacts with other statuses */
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt = NULL;
 	char *msg = NULL, *msg2 = NULL;
@@ -3077,6 +3075,7 @@
 		g_free(msg);
 	if (msg2)
 		g_free(msg2);
+#endif
 }
 
 static GList *yahoo_status_types(GaimAccount *account)
@@ -3398,7 +3397,7 @@
 	NULL, /* set info */
 	yahoo_send_typing,
 	yahoo_get_info,
-	yahoo_set_away,
+	yahoo_set_status,
 	yahoo_set_idle,
 	NULL, /* change_passwd*/
 	yahoo_add_buddy,
--- a/src/protocols/yahoo/yahoo_profile.c	Wed Sep 08 05:31:09 2004 +0000
+++ b/src/protocols/yahoo/yahoo_profile.c	Wed Sep 08 06:07:01 2004 +0000
@@ -659,12 +659,14 @@
 			g_string_append_printf(s, _("<b>Alias:</b> %s<br>"), aliastext);
 			g_free(aliastext);
 		}
+		#if 0
 		if (b->idle > 0) {
 			char *idletime = gaim_str_seconds_to_string(time(NULL) - b->idle);
 			g_string_append_printf(s, _("<b>%s:</b> %s<br>"), _("Idle"),
 					idletime);
 			g_free(idletime);
 		}
+		#endif
 		if (statustext) {
 			g_string_append_printf(s, "%s<br>", statustext);
 			g_free(statustext);