[gnome-keysign: 54/65] Merge branch 'master' into bluetooth

[Gitlab System User <gitlab src gnome org>]

commit 7d400d3e0b93b5e8ad06865fa4729ae06176008d
Merge: 03c9c29 3f32c42
Author: Ludovico de Nittis <aasonykk gmail com>
Date:   Sun Oct 1 19:01:18 2017 +0100

    Merge branch 'master' into bluetooth

 .gitignore                        |  2 +-
 keysign/gnome-keysign-sign-key.py | 12 +++++++----
 keysign/gpgmeh.py                 | 42 ++++++++++++++++++++++++++++++++++-----
 keysign/keylistwidget.py          | 18 ++++++++++++++++-
 keysign/send.py                   |  2 +-
 setup.cfg                         |  2 +-
 tests/fixtures/seckey-1.asc       | 30 ----------------------------
 tests/fixtures/seckey-utf8-2.asc  | 39 ++++++++++++++++++++++++++++++++++++
 tests/fixtures/seckey-utf8.asc    | 37 ++++++++++++++++++++++++++++++++++
 tests/test_gpgmeh.py              | 32 ++++++++++++++++++++++-------
 tests/test_gpgmks.py              | 19 ++++++++++++++++--
 11 files changed, 183 insertions(+), 52 deletions(-)
---
diff --cc keysign/send.py
index 2d24d4f,cec5a3f..d5577aa
--- a/keysign/send.py
+++ b/keysign/send.py
@@@ -7,11 -7,7 +7,11 @@@ import signa
  import gi
  gi.require_version('Gtk', '3.0')
  from gi.repository import Gtk
- from gi.repository import GLib  # for markup_escape_text
+ from gi.repository import GLib
 +if __name__ == "__main__":
 +    from twisted.internet import gtk3reactor
 +    gtk3reactor.install()
 +from twisted.internet import reactor
  
  if  __name__ == "__main__" and __package__ is None:
      logging.getLogger().error("You seem to be trying to execute " +