Tkabber

Check-in [1317b1175e]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fixed typo.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1317b1175efc8345da95175ea4ed5bc6612b218b
User & Date: sgolovan 2016-01-15 10:32:19
Context
2016-01-15
10:35
Don't show any info on conference occupants in roster tooltips if ::ifacetk::roster::options(show_conference_user_info) option is disabled. check-in: 46251c0a1f user: sgolovan tags: trunk
10:32
Fixed typo. check-in: 1317b1175e user: sgolovan tags: trunk
10:30
Fixed finding the conference roster item in the user's roster, made sure the bare conference JID goes first when rendering the roster tooltip. Don't add roster item notes to the conference occupants. check-in: 5581a53077 user: sgolovan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to plugins/roster/annotations.tcl.

152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
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)"]







|







152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
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] && $category 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)"]