← Back to branch summary

~vish/ubuntu/maverick/pidgin/bug25979

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-10-09 19:40:26 UTC
  • mfrom: (1.4.1 upstream) (46.1.10 karmic)
  • Revision ID: james.westby@ubuntu.com-20091009194026-wbqqh0bsbz19nx5q
Tags: 1:2.6.2-1ubuntu7
https://launchpad.net/bugs/346840
https://launchpad.net/bugs/209440
* Don't stick the buddy list window to all desktops as some
  window managers have trouble to properly unstick it (LP: #346840)
  - debian/patches/11_buddy_list_really_show.patch
* Always use default tray icon size on KDE (LP: #209440)
  - debian/patches/62_tray_icon_size_kde.patch
* Use scrollbars in the preferences dialog if the screen height is
  below 700 px instead of 600 px
  - debian/patches/60_1024x600_gtkprefs.c.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/protocols/qq/send_file.c
152
152
        gint size;
153
153
        /* FIXME: It seems that the transfer never use a packet
154
154
         * larger than 1500 bytes, so if it happened to be a
155
 
         * larger packet, either error occured or protocol should
 
155
         * larger packet, either error occurred or protocol should
156
156
         * be modified
157
157
         */
158
158
        ft_info *info;
390
390
        info->local_real_ip = 0x7f000001;
391
391
        */
392
392
        info->local_real_ip = g_ntohl(inet_addr(purple_network_get_my_ip(-1)));
393
 
        purple_debug_info("QQ", "local real ip is %x", info->local_real_ip);
 
393
        purple_debug_info("QQ", "local real ip is %x\n", info->local_real_ip);
394
394
 
395
395
        for (i = 0; i < 2; i++) {
396
396
                sockfd = socket(PF_INET, SOCK_DGRAM, 0);
558
558
        guint8 *raw_data;
559
559
        gint packet_len, bytes;
560
560
 
561
 
        purple_debug_info("_qq_send_packet_file_reject", "start");
 
561
        purple_debug_info("_qq_send_packet_file_reject", "start\n");
562
562
        qd = (qq_data *) gc->proto_data;
563
563
 
564
564
        packet_len = 64;
730
730
        */
731
731
        filename = g_path_get_basename(purple_xfer_get_local_filename(qd->xfer));
732
732
        msg = g_strdup_printf
733
 
                (_("%d canceled the transfer of %s"),
 
733
                (_("%d cancelled the transfer of %s"),
734
734
                 sender_uid, filename);
735
735
 
736
736
        purple_notify_warning (gc, _("File Send"), msg, NULL);
808
808
                            "Received a FACE ip detect from %d, so he/she must be online :)\n", sender_uid);
809
809
 
810
810
                b = purple_find_buddy(gc->account, sender_name);
811
 
                bd = (b == NULL) ? NULL : (qq_buddy_data *) b->proto_data;
 
811
                bd = (b == NULL) ? NULL : purple_buddy_get_protocol_data(b);
812
812
                if (bd) {
813
813
                        if(0 != info->remote_real_ip) {
814
814
                                g_memmove(&(bd->ip), &info->remote_real_ip, sizeof(bd->ip));