Show ykpers lib version.

This commit is contained in:
Dain Nilsson 2015-05-26 15:15:32 +02:00
parent f05ec6ed9e
commit 8f154045b3
3 changed files with 12 additions and 10 deletions

2
vendor/yubicommon vendored

@ -1 +1 @@
Subproject commit 85d851c8b6e50f8a5f6ce10208f0ada832230fa5
Subproject commit 6d450c4119522d93b8e9d8671825a0e09cd26c68

View File

@ -62,6 +62,7 @@ YK_KEY = type('YK_KEY', (Structure,), {})
_yk_errno_location = define('_yk_errno_location', [], c_int)
yk_init = define('yk_init', [], bool)
yk_release = define('yk_release', [], bool)
ykpers_check_version = define('ykpers_check_version', [c_char_p], c_char_p)
yk_open_first_key = define('yk_open_first_key', [], POINTER(YK_KEY))
yk_close_key = define('yk_close_key', [POINTER(YK_KEY)], bool)
@ -76,6 +77,8 @@ YK_EWOULDBLOCK = 0x0b
if not yk_init():
raise Exception("Unable to initialize ykpers")
ykpers_version = ykpers_check_version(None)
def yk_get_errno():
return cast(_yk_errno_location(), POINTER(c_int)).contents.value

View File

@ -29,11 +29,14 @@ import argparse
from PySide import QtGui, QtCore
from yubioath import __version__ as version
from yubioath.yubicommon import qt
from yubioath.gui import messages as m
from yubioath.gui.controller import GuiController
# from yubioath.core.ykpers import libversion as ykpers_version
ykpers_version = 'None'
from yubioath.gui.view.codes import CodesWidget
from ..cli.keystore import get_keystore
try:
from ..core.legacy_otp import ykpers_version
except ImportError:
ykpers_version = 'None'
from . import messages as m
from .controller import GuiController
from .view.codes import CodesWidget
ABOUT_TEXT = """
@ -92,9 +95,6 @@ class YubiOathApplication(qt.Application):
self.window.setWindowTitle(m.win_title_1 % version)
self.window.setWindowIcon(QtGui.QIcon(':/yubioath.png'))
self.window.resize(self._settings.get('size', QtCore.QSize(320, 340)))
pos = self._settings.get('pos')
if pos:
self.window.move(pos)
self._build_menu_bar()
@ -138,7 +138,6 @@ class YubiOathApplication(qt.Application):
self.window.setCentralWidget(self._widget)
def _on_closed(self):
self._settings['pos'] = self.window.pos()
self._settings['size'] = self.window.size()
def _libversions(self):