From: <kak...@us...> - 2008-07-28 14:52:42
|
Revision: 10331 http://amsn.svn.sourceforge.net/amsn/?rev=10331&view=rev Author: kakaroto Date: 2008-07-28 14:52:51 +0000 (Mon, 28 Jul 2008) Log Message: ----------- Requested by CShadowRun from IRC : new option to not show notification windows for blocked contacts. Modified Paths: -------------- trunk/amsn/config.tcl trunk/amsn/lang/langen trunk/amsn/protocol.tcl Modified: trunk/amsn/config.tcl =================================================================== --- trunk/amsn/config.tcl 2008-07-25 15:01:00 UTC (rev 10330) +++ trunk/amsn/config.tcl 2008-07-28 14:52:51 UTC (rev 10331) @@ -310,6 +310,7 @@ ::config::setKey groupnonim 0 ;# Group non IM contacts in a separate group in the CL ::config::setKey showspaces 1 ;# Enable/disable showing of the spaces star in the CL ::config::setKey showOfflineGroup 1 + ::config::setKey no_blocked_notif 0 ;# No notify windows when a user is blocked #Advanced options, not in preferences window # Create the entry in the list and then, set @@ -357,6 +358,7 @@ [list local notifyemail bool notify3] \ [list local notifyemailother bool notify4] \ [list local notifytimeout int notifytimeout] \ + [list local no_blocked_notif bool no_blocked_notif] \ [list local soundactive bool soundactive] \ [list local autolisten_voiceclips bool autolisten_voiceclips] \ [list local recentmsg bool recentmsg] \ Modified: trunk/amsn/lang/langen =================================================================== --- trunk/amsn/lang/langen 2008-07-25 15:01:00 UTC (rev 10330) +++ trunk/amsn/lang/langen 2008-07-28 14:52:51 UTC (rev 10331) @@ -592,6 +592,7 @@ nickchanged $1 Changed his nickname to '$2' no No noactivity Idle +no_blocked_notif Do not show notification windows for blocked contacts nocacheddps No Display Pictures in cache for this user nocamwarn No webcam were found, or your webcam is already in use by another program (which means it cannot be used by aMSN). You will find help on how to solve this issue on our Wiki: nodataavailable No data available for $1 Modified: trunk/amsn/protocol.tcl =================================================================== --- trunk/amsn/protocol.tcl 2008-07-25 15:01:00 UTC (rev 10330) +++ trunk/amsn/protocol.tcl 2008-07-28 14:52:51 UTC (rev 10331) @@ -5850,7 +5850,8 @@ if { (([::config::getKey notifyoffline] == 1 && [::abook::getContactData $user notifyoffline -1] != 0) || - [::abook::getContactData $user notifyoffline -1] == 1) } { + [::abook::getContactData $user notifyoffline -1] == 1) && + ([::config::getKey no_blocked_notif 0] == 0 || ![::MSN::userIsBlocked $email])} { #Show notify window if globally enabled, and not locally disabled, or if just locally enabled set msg $short_name lappend msg [list "newline"] @@ -5873,7 +5874,8 @@ if { (([::config::getKey notifystate] == 1 && [::abook::getContactData $user notifystatus -1] != 0) || - [::abook::getContactData $user notifystatus -1] == 1) } { + [::abook::getContactData $user notifystatus -1] == 1) && + ([::config::getKey no_blocked_notif 0] == 0 || ![::MSN::userIsBlocked $email])} { set msg $short_name lappend msg [list "newline"] @@ -5905,7 +5907,8 @@ if { (([::config::getKey notifyonline] == 1 && [::abook::getContactData $user notifyonline -1] != 0) || - [::abook::getContactData $user notifyonline -1] == 1) } { + [::abook::getContactData $user notifyonline -1] == 1) && + ([::config::getKey no_blocked_notif 0] == 0 || ![::MSN::userIsBlocked $email]) } { set msg $short_name lappend msg [list "newline"] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |