Changeset c32f492 for protocols/yahoo/libyahoo2.c

Timestamp:

2010-03-07T18:41:45Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b52e478, fb020ac

Parents:

1c2eaa3 (diff), 0e99548 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging in improved away/status message code.

File:

• protocols/yahoo/libyahoo2.c (modified) (2 diffs)

protocols/yahoo/libyahoo2.c

@@ -4099 +4099 @@
 
         yd = yid->yd;
-
         old_status = yd->current_status;
-
-        if (msg && strncmp(msg,"Invisible",9)) {
-                yd->current_status = YAHOO_STATUS_CUSTOM;
-        } else {
-                yd->current_status = state;
-        }
+        yd->current_status = state;
 
         /* Thank you libpurple :) */
@@ -4121 +4115 @@
         snprintf(s, sizeof(s), "%d", yd->current_status);
         yahoo_packet_hash(pkt, 10, s);
-         
-        if (yd->current_status == YAHOO_STATUS_CUSTOM) {
-                yahoo_packet_hash(pkt, 19, msg);
-        } else {
-                yahoo_packet_hash(pkt, 19, "");
-        }
-        
+        yahoo_packet_hash(pkt, 19, msg && state == YAHOO_STATUS_CUSTOM ? msg : "");
         yahoo_packet_hash(pkt, 47, (away == 2)? "2": (away) ?"1":"0");
-
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);