Tkabber

Check-in [dbfe9ae6b5]
Login

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

Overview
Comment:Don't show the conference's roster notes in the occupant's user info window.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: dbfe9ae6b587ddec61af7d54dc9b569a3df076b5
User & Date: sgolovan 2016-02-07 10:12:17
Context
2016-02-18
07:42
Don't use black for group and connection label borders. check-in: c5ea281ea7 user: sgolovan tags: trunk
2016-02-07
10:12
Don't show the conference's roster notes in the occupant's user info window. check-in: dbfe9ae6b5 user: sgolovan tags: trunk
2016-02-04
15:48
Got rid of [eval] calls. Do not add -castore and -certfile options if they are empty strings. Defined /etc/ssl/certs as a default value for the loginconf(cacertstore) on unix systems. check-in: 6ac686f9b0 user: sgolovan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.






1
2
3
4
5
6
7





2016-02-04  Sergei Golovan  <sgolovan@nes.ru>

	* plugins/pep/user_avatar.tcl: Renamed user_avatar_notification_hook
	  to user_avatar_pep_notification_hook to prevent clashing with the
	  avatarcache plugin in contrib.

	* plugins/general/autoaway.tcl, plugins/iq/last.tcl: Cleaned up the
>
>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
12
2016-02-07  Sergei Golovan  <sgolovan@nes.ru>

	* plugins/roster/annotations.tcl: Don't show the conference's roster
	  notes in the occupant's user info window.

2016-02-04  Sergei Golovan  <sgolovan@nes.ru>

	* plugins/pep/user_avatar.tcl: Renamed user_avatar_notification_hook
	  to user_avatar_pep_notification_hook to prevent clashing with the
	  avatarcache plugin in contrib.

	* plugins/general/autoaway.tcl, plugins/iq/last.tcl: Cleaned up the

Changes to plugins/roster/annotations.tcl.

277
278
279
280
281
282
283
284

285




286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
    [namespace current]::annotations::prefs_user_menu 76

proc annotations::note_page {tab xlib jid editable} {
    variable notes

    if {$editable} return

    set jid [::xmpp::jid::stripResource $jid]






    if {![info exists notes($xlib,note,$jid)] || \
            $notes($xlib,note,$jid) == ""} {
        return
    }

    set notestab [$tab insert end notes -text [::msgcat::mc "Notes"]]
    set n [userinfo::pack_frame $notestab.notes [::msgcat::mc "Roster Notes"]]

    if {[info exists notes($xlib,cdate,$jid)]} {
        Label $n.cdate -text [::msgcat::mc "Created: %s" \
                                     [clock format $notes($xlib,cdate,$jid) \
                                            -format "%Y-%m-%d %T" -gmt false]]
        pack $n.cdate -side top -anchor w
    }

    if {[info exists notes($xlib,mdate,$jid)]} {
        Label $n.mdate -text [::msgcat::mc "Modified: %s" \
                                     [clock format $notes($xlib,mdate,$jid) \
                                            -format "%Y-%m-%d %T" -gmt false]]
        pack $n.mdate -side top -anchor w
    }

    set sw [ScrolledWindow $n.sw -scrollbar vertical]
    Text $n.text -height 12 -wrap word
    $sw setwidget $n.text
    $n.text insert 0.0 $notes($xlib,note,$jid)
    $n.text configure -state disabled
    pack $sw -side top -fill both -expand yes
    pack $n -fill both -expand yes
}

hook::add userinfo_hook [namespace current]::annotations::note_page 40

# vim:ft=tcl:ts=8:sw=4:sts=4:et







|
>

>
>
>
>
|
|






|

|




|

|







|








277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
    [namespace current]::annotations::prefs_user_menu 76

proc annotations::note_page {tab xlib jid editable} {
    variable notes

    if {$editable} return

    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) == ""} {
        return
    }

    set notestab [$tab insert end notes -text [::msgcat::mc "Notes"]]
    set n [userinfo::pack_frame $notestab.notes [::msgcat::mc "Roster Notes"]]

    if {[info exists notes($xlib,cdate,$bjid)]} {
        Label $n.cdate -text [::msgcat::mc "Created: %s" \
                                     [clock format $notes($xlib,cdate,$bjid) \
                                            -format "%Y-%m-%d %T" -gmt false]]
        pack $n.cdate -side top -anchor w
    }

    if {[info exists notes($xlib,mdate,$bjid)]} {
        Label $n.mdate -text [::msgcat::mc "Modified: %s" \
                                     [clock format $notes($xlib,mdate,$bjid) \
                                            -format "%Y-%m-%d %T" -gmt false]]
        pack $n.mdate -side top -anchor w
    }

    set sw [ScrolledWindow $n.sw -scrollbar vertical]
    Text $n.text -height 12 -wrap word
    $sw setwidget $n.text
    $n.text insert 0.0 $notes($xlib,note,$bjid)
    $n.text configure -state disabled
    pack $sw -side top -fill both -expand yes
    pack $n -fill both -expand yes
}

hook::add userinfo_hook [namespace current]::annotations::note_page 40

# vim:ft=tcl:ts=8:sw=4:sts=4:et