comparison libpurple/protocols/yahoo/libymsg.c @ 31823:d72d728226dc

propagate from branch 'im.pidgin.pidgin' (head fb4d2b014576462db99d919dea15fbed03f1f48a) to branch 'im.pidgin.pidgin.next.minor' (head 4a5878f91c824f207ed343b57b36ae74e1baa438)
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sun, 13 Mar 2011 18:14:04 +0000
parents ea2a155b4439 d88f3153170b
children 7281d151e492 ac3867fbd61f
comparison
equal deleted inserted replaced
31822:6c660dc7cb6a 31823:d72d728226dc
840 case YAHOO_FEDERATION_NONE: 840 case YAHOO_FEDERATION_NONE:
841 default: 841 default:
842 break; 842 break;
843 } 843 }
844 844
845 if (*stat == '1') 845 if (stat && *stat == '1')
846 serv_got_typing(gc, fed_from, 0, PURPLE_TYPING); 846 serv_got_typing(gc, fed_from, 0, PURPLE_TYPING);
847 else 847 else
848 serv_got_typing_stopped(gc, fed_from); 848 serv_got_typing_stopped(gc, fed_from);
849 849
850 if (fed_from != from) 850 if (fed_from != from)
862 if (!f) 862 if (!f)
863 return; /* if they're not on the list, don't bother */ 863 return; /* if they're not on the list, don't bother */
864 864
865 yahoo_friend_set_game(f, NULL); 865 yahoo_friend_set_game(f, NULL);
866 866
867 if (*stat == '1') { 867 if (stat && *stat == '1') {
868 yahoo_friend_set_game(f, game); 868 yahoo_friend_set_game(f, game);
869 if (bud) 869 if (bud)
870 yahoo_update_status(gc, from, f); 870 yahoo_update_status(gc, from, f);
871 } 871 }
872 } else if (!g_ascii_strncasecmp(msg, "WEBCAMINVITE", strlen("WEBCAMINVITE"))) { 872 } else if (!g_ascii_strncasecmp(msg, "WEBCAMINVITE", strlen("WEBCAMINVITE"))) {
918 if(sms) 918 if(sms)
919 g_hash_table_insert(yd->sms_carrier, g_strdup(sms->from), g_strdup(pair->value)); 919 g_hash_table_insert(yd->sms_carrier, g_strdup(sms->from), g_strdup(pair->value));
920 if (pair->key == 16) 920 if (pair->key == 16)
921 server_msg = pair->value; 921 server_msg = pair->value;
922 l = l->next; 922 l = l->next;
923 }
924
925 if(!sms) {
926 purple_debug_info("yahoo", "Received a malformed SMS packet!\n");
927 return;
923 } 928 }
924 929
925 if( (pkt->status == -1) || (pkt->status == YAHOO_STATUS_DISCONNECTED) ) { 930 if( (pkt->status == -1) || (pkt->status == YAHOO_STATUS_DISCONNECTED) ) {
926 if (server_msg) { 931 if (server_msg) {
927 PurpleConversation *c; 932 PurpleConversation *c;