Tkabber

Check-in [46251c0a1f]
Login

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

Overview
Comment:Don't show any info on conference occupants in roster tooltips if ::ifacetk::roster::options(show_conference_user_info) option is disabled.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 46251c0a1f18559760148577f431fdaa5efec7e9
User & Date: sgolovan 2016-01-15 10:35:17
Context
2016-01-15
17:44
Fixed typo. check-in: 3cc5133571 user: sgolovan tags: trunk
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
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.

1
2
3
4
5
6
7
8





9
10
11
12
13
14
15
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.









>
>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
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.

	* ifacetk/roster.tcl: Don't show any info on conference occupants in
	  roster tooltips if
	  ::ifacetk::roster::options(show_conference_user_info) option is
	  disabled.

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.

Changes to ifacetk/roster.tcl.

1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556


1557
1558
1559
1560
1561
1562
1563
            set ask "  [::msgcat::mc {Ask:}] $ask"
        }
    } 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
}








|



>
>







1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
            set ask "  [::msgcat::mc {Ask:}] $ask"
        }
    } else {
        set subsc ""
        set ask ""
    }

    set user_popup_info ""

    if {$category1 ne "conference" || $i == 0 || \
            $options(show_conference_user_info)} {
        set user_popup_info "$name: $status$subsc$ask"

        hook::run roster_user_popup_info_hook \
            [namespace which -variable user_popup_info] $xlib $user
    }

    return $user_popup_info
}