Tkabber

Check-in [7cbebd0400]
Login

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

Overview
Comment:Fixed tab titles for chats with groupchat occupants. They were broken when search for conference roster items was fixed.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 7cbebd04009eca0d11cd93b47ed683b8f73ae08b
User & Date: sgolovan 2016-01-26 16:06:33
Context
2016-02-01
13:01
Don't draw the signed/encrypted message icon for outgoing messages in groupchats because only drawing incoming messages makes sense there. check-in: 538a14498e user: sgolovan tags: trunk
2016-01-26
16:06
Fixed tab titles for chats with groupchat occupants. They were broken when search for conference roster items was fixed. check-in: 7cbebd0400 user: sgolovan tags: trunk
2016-01-25
20:37
Disabled the X-GOOGLE-TOKEN SASL authentication mechanism because it doesn't work anymore. check-in: 1e026b7b28 user: sgolovan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.






1
2
3
4
5
6
7





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

	* plugins/roster/rosterx.tcl: Fixed the attached users dialogs clash.

	* plugins/roster/rosterx.tcl: Show only users missing in roster when
	  displaying add users dialog.

>
>
>
>
>







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

	* chats.tcl: Fixed tab titles for chats with groupchat occupants. They
	  were broken when search for conference roster items was fixed.

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

	* plugins/roster/rosterx.tcl: Fixed the attached users dialogs clash.

	* plugins/roster/rosterx.tcl: Show only users missing in roster when
	  displaying add users dialog.

Changes to chats.tcl.

307
308
309
310
311
312
313


314

315


316
317
318
319
320
321
322

323
324
325
326
327
328
329
330
331
332

proc chat::window_titles {chatid} {
    set xlib [get_xlib $chatid]
    set jid [get_jid $chatid]
    set rjid [roster::find_jid $xlib $jid]
    set chatname [roster::itemconfig $xlib $rjid -name]
    if {$rjid != "" && $chatname != ""} {


        set tabtitlename $chatname

        set titlename $chatname


    } else {
        set titlename $jid
        if {[is_groupchat $chatid]} {
            set tabtitlename [::xmpp::jid::node $jid]
        } else {
            set tabtitlename [get_nick $xlib $jid chat]
        }

        if {$tabtitlename == ""} {
            set tabtitlename $titlename
        }
    }
    return [list $tabtitlename [::msgcat::mc "%s - Chat" $titlename]]
}

proc chat::reconnect_groupchats {xlib} {
    variable chats








>
>
|
>
|
>
>







>
|
|
<







307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330

331
332
333
334
335
336
337

proc chat::window_titles {chatid} {
    set xlib [get_xlib $chatid]
    set jid [get_jid $chatid]
    set rjid [roster::find_jid $xlib $jid]
    set chatname [roster::itemconfig $xlib $rjid -name]
    if {$rjid != "" && $chatname != ""} {
        if {[is_groupchat [chatid $xlib $rjid]] && ![is_groupchat $chatid]} {
            set titlename $jid
            set tabtitlename [get_nick $xlib $jid chat]
        } else {
            set titlename $chatname
            set tabtitlename $chatname
        }
    } else {
        set titlename $jid
        if {[is_groupchat $chatid]} {
            set tabtitlename [::xmpp::jid::node $jid]
        } else {
            set tabtitlename [get_nick $xlib $jid chat]
        }
    }
    if {$tabtitlename == ""} {
        set tabtitlename $titlename

    }
    return [list $tabtitlename [::msgcat::mc "%s - Chat" $titlename]]
}

proc chat::reconnect_groupchats {xlib} {
    variable chats