Tkabber

2016-01-16  Sergei Golovan  <sgolovan@nes.ru>

	* utils.tcl: Don't clean-up the checkbuttons variable before
	  constructing the dialog. This helps to set some checkbuttons in
	  advance by default.

	* plugins/general/gpgme.tcl: Fixed disabling the ecryption in a
	  groupchat after enabling it there.

2016-01-15  Sergei Golovan  <sgolovan@nes.ru>

	* ifacetk/roster.tcl, roster.tcl: Fixed finding the conference roster
	  item in the user's roster, made sure the bare conference JID goes
	  first when rendering the roster tooltip.
	
	* plugins/roster/annotations.tcl: Don't add roster item notes to the

}

hook::add close_chat_post_hook ::ssj::on_close_chat

proc ::ssj::groupchat_encrypt_dialog {xlib jid} {
    variable groupchat_encrypt
    variable signed
    variable groupencrypt[psuffix $xlib]
    unset -nocomplain groupencrypt[psuffix $xlib]

    set chatid [chat::chatid $xlib $jid]

    set nicks {}
    set balloons {}
    set disabled {}

    foreach nick [lsort -dictionary [::muc::roster $chatid]] {
        set user_jid [::xmpp::jid::replaceResource $jid $nick]

        if {![info exists signed($xlib,$user_jid)]} {
            set groupencrypt[psuffix $xlib]($nick) 0
            continue
        }

        lappend nicks $nick $nick
        lappend balloons $nick [signed:info $signed($xlib,$user_jid)]
        unset -nocomplain params
        array set params $signed($xlib,$user_jid)
        if {[info exists params(reason)]} {
            set groupencrypt[psuffix $xlib]($nick) 0
            lappend disabled $nick 1
        } else {
            set idx [list $xlib $jid $nick]
            if {[info exists groupchat_encrypt($idx)]} {
                set groupencrypt[psuffix $xlib]($nick) $groupchat_encrypt($idx)
            }
        }
    }

    set dw .groupencrypt[psuffix $xlib]
    if {[winfo exists $dw]} {
        destroy $dw
    }

        set idx [list $xlib $jid $nick]

        if {![info exists groupchat_encrypt($idx)]} {
            set groupchat_encrypt($idx) 0
        }
        if {[set groupencrypt[psuffix $xlib]($nick)]} {
            set groupchat_encrypt($idx) 1
        } else {
            set groupchat_encrypt($idx) 0
        }
    }

    destroy $dw
    unset -nocomplain groupencrypt[psuffix $xlib]
}

proc ::ssj::aggregate_encrypt {name1 name2 op} {
    variable options
    variable groupchat_encrypt

    # Node and server can't contain a comma
    lassign [split $name2] xlib jid
    set chatid [chat::chatid $xlib $jid]
    foreach nick [::muc::roster $chatid] {

        set idx [list $xlib $jid $nick]

        if {[info exists groupchat_encrypt($idx)] &&
                                        $groupchat_encrypt($idx)} {
            set options(encrypt,$xlib,$jid) 1
            return
        }

    bind $path <Key-Up> [list focus_prev %W [double% $sf]]
    bind $path <Key-Down> [list focus_next %W [double% $sf]]
    bind $path <Key-Tab> [list focus_next %W [double% $sf]]
    bind $path <Shift-Tab> [list focus_prev %W [double% $sf]]
    bind $path <<PrevWindow>> [list focus_prev %W [double% $sf]]
    bindscroll $sff $sf





    set temp {}
    foreach idx [array names names] {
        lappend temp [list $idx $names($idx)]
    }

    set i 0
    foreach idxt [lsort -dictionary -index 1 $temp] {
        set idx [lindex $idxt 0]
        if {$radio} {
            set cb [Radiobutton $sff.cb$i -variable $var \
                                          -text $names($idx) \
                                          -value $idx]
            if {![info exists result] && $i == 0} {
                set result $idx
            }
        } else {
            if {![info exists result($idx)]} {
                set result($idx) 0
            }
            set cb [Checkbutton $sff.cb$i -variable ${var}($idx) \
                                          -text $names($idx)]
        }
        if {[info exists disabled($idx)] && $disabled($idx)} {
            $sff.cb$i configure -state disabled
        }
        bind $cb <Return> [list [double% $path] invoke 0]