Changes in protocols/yahoo/libyahoo2.c [be915f5:99c8f13]

File:

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

protocols/yahoo/libyahoo2.c

@@ -1530 +1530 @@
                         newbud = y_new0(struct yahoo_buddy, 1);
                         newbud->id = strdup(pair->value);
-                        if (cur_group) {
+                        if(cur_group)
                                 newbud->group = strdup(cur_group);
-                        } else {
-                                YList *last;
-                                struct yahoo_buddy *lastbud;
-                                
-                                for (last = yd->buddies; last && last->next; last = last->next);
-                                if (last) {
-                                        lastbud = last->data;
-                                        newbud->group = strdup(lastbud->group);
-                                } else {
-                                        newbud->group = strdup("Buddies");
-                                }
+                        else {
+                                struct yahoo_buddy *lastbud = (struct yahoo_buddy *)y_list_nth(
+                                                                yd->buddies, y_list_length(yd->buddies)-1)->data;
+                                newbud->group = strdup(lastbud->group);
                         }
 
@@ -2400 +2393 @@
 {
         struct yahoo_https_auth_data *had = req->data;
-        struct yahoo_input_data *yid;
-        struct yahoo_data *yd;
+        struct yahoo_input_data *yid = had->yid;
+        struct yahoo_data *yd = yid->yd;
         int st;
-        
-        if (y_list_find(inputs, had->yid) == NULL)
-                return;
-        
-        yid = had->yid;
-        yd = yid->yd;
         
         if (req->status_code != 200) {
@@ -2449 +2436 @@
 {
         struct yahoo_https_auth_data *had = req->data;
-        struct yahoo_input_data *yid;
-        struct yahoo_data *yd;
+        struct yahoo_input_data *yid = had->yid;
+        struct yahoo_data *yd = yid->yd;
         struct yahoo_packet *pack;
-        char *crumb = NULL;
+        char *crumb;
         int st;
-        
-        if (y_list_find(inputs, had->yid) == NULL)
-                return;
-        
-        yid = had->yid;
-        yd = yid->yd;
         
         md5_byte_t result[16];
@@ -4099 +4080 @@
 
         yd = yid->yd;
+
         old_status = yd->current_status;
-        yd->current_status = state;
+
+        if (msg && strncmp(msg,"Invisible",9)) {
+                yd->current_status = YAHOO_STATUS_CUSTOM;
+        } else {
+                yd->current_status = state;
+        }
 
         /* Thank you libpurple :) */
@@ -4115 +4102 @@
         snprintf(s, sizeof(s), "%d", yd->current_status);
         yahoo_packet_hash(pkt, 10, s);
-        yahoo_packet_hash(pkt, 19, msg && state == YAHOO_STATUS_CUSTOM ? msg : "");
+         
+        if (yd->current_status == YAHOO_STATUS_CUSTOM) {
+                yahoo_packet_hash(pkt, 19, msg);
+        } else {
+                yahoo_packet_hash(pkt, 19, "");
+        }
+        
         yahoo_packet_hash(pkt, 47, (away == 2)? "2": (away) ?"1":"0");
+
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);