← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnupg2/quantal-proposed

« back to all changes in this revision

Viewing changes to agent/agent.h

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-05-25 14:27:35 UTC
  • mfrom: (1.1.15 upstream) (7.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20110525142735-jccyw0fopnyv728q
Tags: 2.0.17-2ubuntu1
* Merge from debian unstable. Remaining changes:
  - Add udev rules to give gpg access to some smartcard readers;
    Debian #543217.
    . debian/gnupg2.dev: udev rules to set ACLs on SCM smartcard readers.
    . debian/rules: Call dh_installudev.
  - debian/control: Rename Vcs-* to XS-Debian-Vcs-*.

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/agent.h
61
61
  char *startup_lc_ctype;
62
62
  char *startup_lc_messages;
63
63
 
 
64
  /* True if we are listening on the standard socket.  */
 
65
  int use_standard_socket;
 
66
 
 
67
  /* True if we handle sigusr2.  */
 
68
  int sigusr2_enabled;
64
69
 
65
70
  const char *pinentry_program; /* Filename of the program to start as
66
71
                                   pinentry.  */