Tkabber

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
	  conference occupants.

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

	* plugins/general/gpgme.tcl: Fixed behavior of the dialog with
	  conference participants to encrypt to if there's none of them.
	  Also, removed unnecessary catch guards.

	* utils.tcl: Add the checkbox dialog title to the dialog window

    # TODO: metacontacts
    if {$jids == {}} {
        set jids [list $jid]
    }

    set text {}
    set i 0
    foreach j [lsort $jids] {
        append text "\n[user_popup_info $xlib $j $i]"
        incr i
    }
    set text [string trimleft $text "\n"]
    return $text
}

proc roster::user_popup_info {xlib user i} {

    } else {
        set subsc ""
        set ask ""
    }

    set user_popup_info "$name: $status$subsc$ask"

    if {$category1 ne "conference" || $i == 0 || \
            $options(show_conference_user_info)} {
        hook::run roster_user_popup_info_hook \
            [namespace which -variable user_popup_info] $xlib $user
    }

    return $user_popup_info
}

        -type user -buttons ok -default 0 -cancel 0
}

proc annotations::add_user_popup_info {infovar xlib jid} {
    variable notes
    upvar 0 $infovar info

    set bjid [::xmpp::jid::stripResource $jid]
    lassign [::roster::get_category_and_subtype $xlib $bjid] category subtype

    if {![::xmpp::jid::equal $bjid $jid] && $categoty ne "user"} {
        return
    }

    if {[info exists notes($xlib,note,$bjid)] && \
            $notes($xlib,note,$bjid) != ""} {
        append info "\n\tNote:\t"
        append info [string map [list "\n" "\n\t\t"] "$notes($xlib,note,$bjid)"]

        if {0} {
            if {[info exists notes($xlib,cdate,$bjid)]} {
                append info [format "\n\tNote created: %s" \
                                 [clock format $notes($xlib,cdate,$bjid) \
                                        -format "%Y-%m-%d %T" -gmt false]]
            }
            if {[info exists notes($xlib,mdate,$bjid)]} {
                append info [format "\n\tNote modified: %s" \
                                 [clock format $notes($xlib,mdate,$bjid) \
                                        -format "%Y-%m-%d %T" -gmt false]]
            }
        }
    }
}

hook::add roster_user_popup_info_hook \

    }

    if {$jid in $roster(jids,$xlib)} {
        return $jid
    }

    lassign [get_category_and_subtype $xlib $jid] category subtype
    if {$category eq "user"} {
        set rjid [::xmpp::jid::removeResource $jid]
        if {$rjid in $roster(jids,$xlib)} {
            lassign [get_category_and_subtype $xlib $rjid] rcategory rsubtype
            switch -- $rcategory {
                user -
                conference {
                    return $rjid
                }
                default {
                    return ""
                }
            }
        }
    }
    return ""
}

proc roster::get_label {xlib jid} {

    if {$node == "" && $resource == ""} {
        set updomain [lindex [split $server .] 0]
        set category service

        switch -- $updomain {
            aim        -
            conference -
            icq        -
            irc        -
            jabber     -
            jud        -
            msn        -
            mrim       -
            pager      -
            rss        -
            serverlist -
            sms        -
            smtp       -
            yahoo {
                set subtype $updomain
            }
            gg {
                set subtype gadu-gadu
            }