Mercurial > pidgin
diff src/protocols/yahoo/yahoo.c @ 11608:5e3f07172dab
[gaim-migrate @ 13879]
move the gaim_input_remove to the top to try to stop a crash.
committer: Tailor Script <tailor@pidgin.im>
author | Tim Ringenbach <marv@pidgin.im> |
---|---|
date | Tue, 04 Oct 2005 13:31:28 +0000 |
parents | a26eb48d1953 |
children | a9c5fcce537b |
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo.c Tue Oct 04 05:03:02 2005 +0000 +++ b/src/protocols/yahoo/yahoo.c Tue Oct 04 13:31:28 2005 +0000 @@ -665,7 +665,7 @@ GSList *l = pkt->hash; GSList *list = NULL; struct _yahoo_im *im = NULL; - + char imv[16]; if (pkt->status <= 1 || pkt->status == 5) { @@ -701,22 +701,22 @@ gaim_notify_error(gc, NULL, _("Your Yahoo! message did not get sent."), NULL); } - + // Check for the Doodle IMV if( !strcmp( imv, "doodle;11" ) ) { GaimWhiteboard *wb; g_print( "'doodle;11' found in chat packet\n" ); - + wb = gaim_whiteboard_get_session( gc->account, im->from ); - + // If a Doodle session doesn't exist between this user if( wb == NULL ) { g_print( "Creating new whiteboard for chat packet request\n" ); wb = gaim_whiteboard_create( gc->account, im->from, DOODLE_STATE_REQUESTED ); - + yahoo_doodle_command_send_request( gc, im->from ); yahoo_doodle_command_send_ready( gc, im->from ); } @@ -2524,6 +2524,9 @@ struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data; GSList *l; + if (gc->inpa) + gaim_input_remove(gc->inpa); + for (l = yd->confs; l; l = l->next) { GaimConversation *conv = l->data; @@ -2554,8 +2557,7 @@ yahoo_buddy_icon_upload_data_free(yd->picture_upload_todo); if (yd->ycht) ycht_connection_close(yd->ycht); - if (gc->inpa) - gaim_input_remove(gc->inpa); + g_free(yd); } @@ -3001,7 +3003,7 @@ yahoo_packet_hash_str(pkt, 63, "doodle;11"); else yahoo_packet_hash_str(pkt, 63, ";0"); // IMvironment - + yahoo_packet_hash_str(pkt, 64, "0"); /* no idea */ yahoo_packet_hash_str(pkt, 1002, "1"); /* no idea, Yahoo 6 or later only it seems */ if (!yd->picture_url) @@ -3542,7 +3544,7 @@ GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_PRPL_ONLY, "prpl-yahoo", yahoogaim_cmd_buzz, _("buzz: Buzz a contact to get their attention"), NULL); - + gaim_cmd_register("doodle", "", GAIM_CMD_P_PRPL, GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_PRPL_ONLY, "prpl-yahoo", yahoo_doodle_gaim_cmd_start,