← Back to branch summary

~micahg/ubuntu/natty/pidgin/2.7.9-2

« back to all changes in this revision

Viewing changes to libpurple/protocols/qq/send_file.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-11-05 19:44:21 UTC
  • mfrom: (62.1.1 maverick-security) (2.3.12 sid)
  • Revision ID: james.westby@ubuntu.com-20101105194421-8r8o4pzw2m5j4hiy
Tags: 1:2.7.5-1ubuntu1
Resync on Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/protocols/qq/send_file.c
637
637
{
638
638
        PurpleConnection *gc;
639
639
        PurpleAccount *account;
640
 
        guint16 *seq;
641
640
 
642
641
        g_return_if_fail (xfer != NULL);
643
 
        seq = (guint16 *) xfer->data;
644
642
        account = purple_xfer_get_account(xfer);
645
643
        gc = purple_account_get_connection(account);
646
644
 
670
668
{
671
669
        PurpleConnection *gc;
672
670
        PurpleAccount *account;
673
 
        ft_info *info;
674
671
 
675
 
        g_return_if_fail (xfer != NULL && xfer->data != NULL);
676
 
        info = (ft_info *) xfer->data;
 
672
        g_return_if_fail(xfer != NULL);
677
673
        account = purple_xfer_get_account(xfer);
678
674
        gc = purple_account_get_connection(account);
679
675
 
752
748
        g_return_if_fail (data != NULL && data_len != 0);
753
749
        qd = (qq_data *) gc->proto_data;
754
750
        xfer = qd->xfer;
755
 
        info = (ft_info *) qd->xfer->data;
 
751
        info = (ft_info *) xfer->data;
756
752
 
757
753
        if (data_len <= 30 + QQ_CONN_INFO_LEN) {
758
754
                purple_debug_warning("QQ", "Received file reject message is empty\n");
761
757
 
762
758
        bytes = 18 + 12;        /* skip 30 bytes */
763
759
        qq_get_conn_info(info, data + bytes);
764
 
        _qq_xfer_init_socket(qd->xfer);
 
760
        _qq_xfer_init_socket(xfer);
765
761
 
766
762
        _qq_xfer_init_udp_channel(info);
767
763
        _qq_send_packet_file_notifyip(gc, sender_uid);