← Back to branch summary

~ubuntu-branches/ubuntu/saucy/amsn/saucy

« back to all changes in this revision

Viewing changes to msnp2p.tcl

  • Committer: Bazaar Package Importer
  • Author(s): Devid Antonio Filoni
  • Date: 2010-04-13 23:21:29 UTC
  • mfrom: (1.1.11 upstream) (3.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100413232129-vgpx20brdd2qavs7
Tags: 0.98.3-0ubuntu1
https://launchpad.net/bugs/449072
https://launchpad.net/bugs/562619
* Merge from Debian unstable (LP: #449072), remaining Ubuntu changes:
  - add 08_use_aplay_for_sound.dpatch patch by Festor Wailon Dacoba to use
    aplay to play sounds
  + debian/control:
    - modify iceweasel to firefox | abrowser in amsn Suggests field
    - add xdg-utils and gstreamer0.10-nice to amsn Depends field
    - mofify sox to alsa-utils in amsn Suggests field as we are now using
      aplay
* New upstream release (LP: #562619), tarball repacked according to
  debian/README.source.
* Fix missing-debian-source-format lintian warning.

Show diffs side-by-side

added added

removed removed

Lines of Context:
msnp2p.tcl
1
1
 
2
 
::Version::setSubversionId {$Id: msnp2p.tcl 11444 2009-08-07 22:59:51Z kakaroto $}
 
2
::Version::setSubversionId {$Id: msnp2p.tcl 11879 2010-01-09 06:39:00Z kakaroto $}
3
3
 
4
4
::snit::type P2PMessage {
5
5
 
726
726
                                        }
727
727
                                        "41D3E74E-04A2-4B37-96F8-08ACDB610874" {
728
728
                                                status_log "MSNP2P | $sid Received a Photo Sharing invitation from $dest\n" red
 
729
                                                ::MSN6FT::GotPhotoSharingInvitation $chatid
 
730
                                                return
 
731
 
729
732
                                                SessionList set $sid [list 0 0 0 $dest 0 $uid 0 "phot" "" ""]
730
733
 
731
734
                                                # Let's send an ACK
732
735
                                                SendPacket [::MSN::SBFor $chatid] [MakeACK $sid 0 $cTotalDataSize $cId $cAckId]
733
736
                                                status_log "MSNP2P | $sid $dest -> Sent ACK for INVITE\n" red
734
737
 
 
738
                                                set slpdata [MakeMSNSLP "DECLINE" $dest [::config::getKey login] $branchuid [expr {$cseq + 1}] $uid 0 0 $sid]
 
739
                                                #SendPacket [::MSN::SBFor $chatid] [MakePacket $sid $slpdata 1]
 
740
 
 
741
                                                set slpdata [MakeMSNSLP "BYE" $dest [::config::getKey login] $branchuid 0 $uid 0 1 "AAHHig=="]
 
742
                                                SendPacket [::MSN::SBFor $chatid] [MakePacket $sid $slpdata 1]
 
743
 
 
744
                                                # And we unset our sid vars
 
745
                                                #::MSNP2P::SessionList unset $sid
 
746
 
735
747
                                                # Let's make and send a 200 OK Message
736
 
                                                set slpdata [MakeMSNSLP "OK" $dest [::config::getKey login] $branchuid [expr {$cseq + 1}] $uid 0 0 $sid]
737
 
                                                SendPacket [::MSN::SBFor $chatid] [MakePacket $sid $slpdata 1]
738
 
                                                status_log "MSNP2P | $sid $dest -> Sent 200 OK Message\n" red
 
748
                                                #set slpdata [MakeMSNSLP "OK" $dest [::config::getKey login] $branchuid [expr {$cseq + 1}] $uid 0 0 $sid]
 
749
                                                #SendPacket [::MSN::SBFor $chatid] [MakePacket $sid $slpdata 1]
 
750
                                                #status_log "MSNP2P | $sid $dest -> Sent 200 OK Message\n" red
739
751
                                                                                
740
752
                                                return
741
753
                                        }