Tkabber

Check-in [46048a40a5]
Login

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

Overview
Comment:Don't look at the GPG_AGENT_INFO environment variable. Just set the passphrase callback property unconditionally because in the presence of gpg-agent it's simply ignored.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 46048a40a56cfe82dae660fa168d4695d66f7ceb
User & Date: sgolovan 2015-12-26 16:44:42
Context
2015-12-26
18:35
Added another user setting. It specifies the maximum time interval between two unsuccessful connection retries. check-in: 1f18237022 user: sgolovan tags: trunk
16:44
Don't look at the GPG_AGENT_INFO environment variable. Just set the passphrase callback property unconditionally because in the presence of gpg-agent it's simply ignored. check-in: 46048a40a5 user: sgolovan tags: trunk
2015-12-21
17:35
Generate event <<ThemeChanged>> for widgets wrapped into a nice bordered ttk::entry only if they actually exist. check-in: ee0ab03ebe user: sgolovan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.








1
2
3
4
5
6
7







2015-12-21  Sergei Golovan  <sgolovan@nes.ru>

	* messages.tcl, namespaces.tcl, plugins/roster/rosterx.tcl,
	  roster.tcl: Use ::xmpp::roster::send procedure to send roster items
	  to the user's server. Send the items separately because it's a
	  requirement of RFC-6121.

>
>
>
>
>
>
>







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

	* plugins/general/gpgme.tcl: Don't look at the GPG_AGENT_INFO
	  environment variable. Just set the passphrase callback property
	  unconditionally because in the presence of gpg-agent it's simply
	  ignored.

2015-12-21  Sergei Golovan  <sgolovan@nes.ru>

	* messages.tcl, namespaces.tcl, plugins/roster/rosterx.tcl,
	  roster.tcl: Use ::xmpp::roster::send procedure to send roster items
	  to the user's server. Send the items separately because it's a
	  requirement of RFC-6121.

Changes to plugins/general/gpgme.tcl.

183
184
185
186
187
188
189




190





191
192
193
194
195
196
197
198
199
200

    set ctx($xlib) [gpg::new]
    $ctx($xlib) set -property armor \
                    -value    true
    $ctx($xlib) set -property encoding \
                    -value    utf-8





    if {![info exists env(GPG_AGENT_INFO)]} {





        $ctx($xlib) set -property passphrase-callback \
                        -value    [list ::ssj::passphrase $xlib]
    }

    set pattern [connection_bare_jid $xlib]

    set firstP 1
    if {$options(key) ne ""} {
        set patterns [list $options(key)]
    } else {







>
>
>
>
|
>
>
>
>
>
|
|
<







183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201

202
203
204
205
206
207
208

    set ctx($xlib) [gpg::new]
    $ctx($xlib) set -property armor \
                    -value    true
    $ctx($xlib) set -property encoding \
                    -value    utf-8

    # Setting the passphrase-callback property doesn't prevent from using
    # pinentry via gpg-agent. passphrase-callback will just be ignored in
    # that case. It will only be used if the agent allows loopback pinentry
    # mode (allow-loopback-pinentry in ~/.gnupg/gpg-agent.conf) for gpg 2.1.

    # So, passphrase-callback is not ignored for:

    # 1. gpg 1.4 without GPG_AGENT_INFO set to something sensible
    # 2. gpg 2.1 with agent that allow using loopback pinentry

    $ctx($xlib) set -property passphrase-callback \
                    -value    [list ::ssj::passphrase $xlib]


    set pattern [connection_bare_jid $xlib]

    set firstP 1
    if {$options(key) ne ""} {
        set patterns [list $options(key)]
    } else {