look at the last line of Jerome's commit info...
please, someone consider it...
------- Forwarded message -------
From: "Jerome Gagnon-Voyer" <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Subject: [Amsn-commits] msn msncam.tcl,1.122,1.123 msnp2p.tcl,1.37,1.38
Date: Sun, 04 Dec 2005 02:43:34 -0500
Update of /cvsroot/amsn/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1817
Modified Files:
msncam.tcl msnp2p.tcl
Log Message:
Now if we get a videoconversation invite from MSN 7.5, we automatically
decline
And ask the user if he wants to invite to receive/send a webcam session
with the other guy
Thanks for youness for the protocol stuff
I completed the GUI
Thanks for testing Youness
and
THE KEYS ARE NOT DONE YET, IF YOU HAVE FEW MINUTES TO DO THAT, WE WILL
APPRECIATE, THANKS!
Index: msncam.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/msncam.tcl,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** msncam.tcl 4 Dec 2005 07:34:59 -0000 1.122
--- msncam.tcl 4 Dec 2005 07:43:32 -0000 1.123
***************
*** 1919,1922 ****
--- 1919,1989 ----
}
+ proc GotVideoConferenceInvitation {chatid} {
+ SendMessageFIFO [list ::CAMGUI::GotVideoConferenceInvitationWrapped
$chatid] "::amsn::messages_stack($chatid)"
"::amsn::messages_flushing($chatid)"
+ }
+
+
+ #Show a message when we receive a video-conference invitation to ask
the user if he wants
+ #To ask to receive/send webcam because video-conference is not supported
+ proc GotVideoConferenceInvitationWrapped {chatid} {
+
+ #Grey line
+ ::amsn::WinWrite $chatid "\n" green
+ ::amsn::WinWriteIcon $chatid greyline 3
+ ::amsn::WinWrite $chatid "\n" green
+ #WebcamIcon
+ ::amsn::WinWriteIcon $chatid winwritecam 3 2
+ #Description of the problem
+ ::amsn::WinWrite $chatid "[timestamp] You just received a video
conversation (bidirectional audio and video) request. \
+ This feature is not yet supported by aMSN and has been canceled.
However, you can still use the standard webcam conversation.\n" green
+ #Choices of action
+ ::amsn::WinWriteClickable $chatid "Click Here" [list
::CAMGUI::AskWebcamAfterVideoInvitation $chatid] askwebcam$chatid
+ ::amsn::WinWrite $chatid " to ask for your contact's webcam, or
" green
+ ::amsn::WinWriteClickable $chatid "Click Here" [list
::CAMGUI::SendInviteCamAfterVideoInvitation $chatid] sendwebcam$chatid
+ ::amsn::WinWrite $chatid " to ask for sending your own webcam"
green
+
+ }
+ #After we clicked one time on Ask webcam invitaiton, disable the click
here button in the chatwindow
+ proc AskWebcamAfterVideoInvitation {chatid } {
+
+ #Get the chatwindow name
+ set win_name [::ChatWindow::For $chatid]
+ if { [::ChatWindow::For $chatid] == 0} {
+ return 0
+ }
+
+ #Disable items in the chatwindow
+ [::ChatWindow::GetOutText ${win_name}] tag configure
askwebcam$chatid \
+ -foreground #808080 -font bplainf -underline false
+ [::ChatWindow::GetOutText ${win_name}] tag bind askwebcam$chatid
<Enter> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind askwebcam$chatid
<Leave> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind askwebcam$chatid
<Button1-ButtonRelease> ""
+
+ [::ChatWindow::GetOutText ${win_name}] conf -cursor left_ptr
+
+ #Send the invitation to ask webcam
+ ::MSNCAM::AskWebcamQueue $chatid
+ }
+
+ proc SendInviteCamAfterVideoInvitation {chatid} {
+
+ #Get the chatwindow name
+ set win_name [::ChatWindow::For $chatid]
+ if { [::ChatWindow::For $chatid] == 0} {
+ return 0
+ }
+
+ #Disable items in the chatwindow
+ [::ChatWindow::GetOutText ${win_name}] tag configure sendwebcam$chatid
\
+ -foreground #808080 -font bplainf -underline false
+ [::ChatWindow::GetOutText ${win_name}] tag bind sendwebcam$chatid
<Enter> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind sendwebcam$chatid
<Leave> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind sendwebcam$chatid
<Button1-ButtonRelease> ""
+
+ [::ChatWindow::GetOutText ${win_name}] conf -cursor left_ptr
+ #Send the invitation to send webcam
+ ::MSNCAM::SendInviteQueue $chatid
+ }
+
proc InvitationAccepted { chatid dest branchuid cseq uid sid producer} {
#Get the chatwindow name
***************
*** 2039,2043 ****
if {[winfo exists $w]} {
raise $w
! return 1
}
abook::getIPConfig
--- 2106,2110 ----
if {[winfo exists $w]} {
raise $w
! return
}
abook::getIPConfig
Index: msnp2p.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/msnp2p.tcl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** msnp2p.tcl 25 Oct 2005 03:51:51 -0000 1.37
--- msnp2p.tcl 4 Dec 2005 07:43:32 -0000 1.38
***************
*** 554,568 ****
set producer 0
} else {
! set producer 1
}
status_log "we got an webcam
invitation" red
-
- SessionList set $sid [list 0 0 0 $dest 0 $uid 0 "webcam" ""
"$branchuid"]
! ::CAMGUI::AcceptOrRefuse $chatid $dest $branchuid $cseq $uid $sid
$producer
#answerFtInvite $sid $chatid
$branchuid $conntype
# Let's send an ACK
SendPacket [::MSN::SBFor $chatid] [MakeACK $sid 0 $cTotalDataSize
$cId $cAckId]
status_log "MSNP2P | $sid $dest ->
Sent ACK for INVITE\n" red
return
--- 554,583 ----
set producer 0
} else {
! set producer 1
}
status_log "we got an webcam
invitation" red
! set context [base64::decode
$context]
! set context [FromUnicode
$context]
!
#answerFtInvite $sid $chatid
$branchuid $conntype
# Let's send an ACK
SendPacket [::MSN::SBFor $chatid] [MakeACK $sid 0 $cTotalDataSize
$cId $cAckId]
+
+ SessionList set $sid [list 0 0 0 $dest 0 $uid 0 "webcam" ""
"$branchuid"]
+
+ if { $context !=
"\{B8BE70DE-E2CA-4400-AE03-88FF85B9F4E8\}" } {
+ status_log "Received a video conferenced invitation.. we do not
support this"
+
::CAMGUI::InvitationRejected $chatid $sid $branchuid $uid
+ #::MSNCAM::RejectFT
$chatid $sid $branchuid $uid
+
::CAMGUI::GotVideoConferenceInvitation $chatid
+ return
+ }
+
+
+
+ ::CAMGUI::AcceptOrRefuse $chatid $dest $branchuid $cseq $uid $sid
$producer
+
status_log "MSNP2P | $sid $dest ->
Sent ACK for INVITE\n" red
return
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log
files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Amsn-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/amsn-commits
--
KaKaRoTo
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Amsn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/amsn-devel
