[openpgp-applet] 23/42: Merge branch 'master' into feature/7711-Gtk3

[Clement Hermann]

This is an automated email from the git hooks/post-receive script.

nodens-guest pushed a commit to branch master
in repository openpgp-applet.

commit d581f5dbe7c8ea01f838ffc7d65dccef09a34b69
Merge: 0dedfee 921c580
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Aug 29 09:52:39 2016 +0000

    Merge branch 'master' into feature/7711-Gtk3

 bin/openpgp-applet | 1 +
 1 file changed, 1 insertion(+)

diff --cc bin/openpgp-applet
index 46c53a2,81260c5..0b0ba7b
--- a/bin/openpgp-applet
+++ b/bin/openpgp-applet
@@@ -92,10 -93,11 +92,11 @@@ use constant COMBO_FINGERPRINT => 2
  use constant COMBO_ROLE        => 3;
  
  my $gnupg         = Crypt::OpenPGP_Applet::GnuPG::Interface->new();
+ $gnupg->call('gpg2');
  my $codeset       = langinfo(CODESET());
  my $encoding      = find_encoding($codeset);
 -my $main_window   = Gtk2::Window->new();
 -my $icon_factory  = Gtk2::IconFactory->new();
 +my $main_window   = Gtk3::Window->new();
 +my $icon_factory  = Gtk3::IconFactory->new();
  # Set always_trust since GnuPG otherwise will fail if the key's
  # trust hasn't been set.
  my %gnupg_options = (armor => 1, always_trust => 0, meta_interactive => 0);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/openpgp-applet.git