Tkabber

2015-12-29  Sergei Golovan  <sgolovan@nes.ru>

	* login.tcl, proxy.tcl: Enabled TLS1.1 and TLS1.2 protocols if they
	  are available.

	* utils.tcl: Added an optional parameter which makes some of the
	  choices in checkbox dialogs disabled.

	* plugins/general/gpgme.tcl: Replaced the group encrypt menu by a
	  dialog. Fixed fetching missing key.

2015-12-27  Sergei Golovan  <sgolovan@nes.ru>

	* ifacetk/iface.tcl, ifacetk/roster.tcl: Use grid instead of pack for
	  the roster and roster filter because it works better when the main
	  window is being resized.

    array set params $pinfo

    set keyids {}
    foreach signature $params(signatures) {
        catch {unset sparams}
        array set sparams $signature

        if {[info exists sparams(keyid)]} {
            lappend keyids [string range $sparams(keyid) end-7 end]
        }
    }

    incr gpg_error_id
    if {[catch {exec gpg --recv-keys {*}$keyids 2>@1} output]} {
        NonmodalMessageDlg .keyfetch_error$gpg_error_id \
            -aspect 50000 -icon error \

    set xlib [chat::get_xlib $chatid]
    set jid [chat::get_jid $chatid]
    set cw [chat::winid $chatid]

    set w $cw.status.encrypted

    if {$type eq "chat"} {
        set command [list ::ssj::encrypt:toggleP $xlib $jid]
    } else {
        set command [list ::ssj::groupchat_encrypt_dialog $xlib $jid]
        set options(encrypt,$xlib,$jid) 0
    }
    Button $w \
           -relief link \
           -image [encrypted:icon $xlib $jid] \
           -helptype balloon \
           -helptext [::msgcat::mc "Toggle encryption"] \
           -command $command












    encrypted:trace \
        "$w configure -image \[::ssj::encrypted:icon $xlib $jid\]" $xlib $jid
    pack $w -side left -before $cw.status.mb

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

    array unset groupchat_encrypt [list $xlib $jid *]
    set options(encrypt,$xlib,$jid) 0
}

hook::add close_chat_post_hook ::ssj::on_close_chat

proc ::ssj::groupchat_encrypt_dialog {xlib jid} {
    variable groupchat_encrypt
    variable signed

    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)]} 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)]} {
            lappend disabled $nick 1
        }
    }

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

    CbDialog $dw [::msgcat::mc "Select room %s participants for encrypting\
                                traffic to" $jid] \
        [list [::msgcat::mc "OK"] [list ::ssj::save_groupchat_encrypt $dw $xlib $jid] \
              [::msgcat::mc "Cancel"] [list destroy $dw]] \
        ::ssj::groupencrypt[psuffix $xlib] $nicks $balloons \
        -disabled $disabled -modal local
}

proc ::ssj::save_groupchat_encrypt {dw xlib jid} {
    variable groupchat_encrypt
    variable groupencrypt[psuffix $xlib]

    foreach nick [array names groupencrypt[psuffix $xlib]] {
        set idx [list $xlib $jid $nick]

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


    }

    destroy $dw
    unset groupencrypt[psuffix $xlib]
}

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

    # Node and server can't contain a comma

    set modal none
    set radio 0
    foreach {opt val} $args {
        switch -- $opt {
            -type { set radio [string equal $val radio] }
            -modal { set modal $val }
            -disabled { array set disabled $val }
        }
    }

    set len [llength $buttons]

    Dialog $path -title $title \
                 -modal $modal \

            if {$i == 0} {
                set result $idx
            }
        } else {
            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]
        bind $cb <Return> +break
        bind $cb <1> [list focus %W]
        bindscroll $cb $sf
        if {[info exists balloons($idx)]} {
            balloon::setup $cb -text $balloons($idx)