gpg: Fix wrong output in list mode.

[gnupg.git] / g10 / keyring.h

diff --git a/g10/keyring.h b/g10/keyring.h
index 9b63f32..1469b70 100644 (file)
--- a/g10/keyring.h
+++ b/g10/keyring.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or

  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,


@@ -14,22 +14,23 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.

  */
 
 #ifndef GPG_KEYRING_H
 #define GPG_KEYRING_H 1
 
  */
 
 #ifndef GPG_KEYRING_H
 #define GPG_KEYRING_H 1
 

-#include "global.h"
+#include "../common/userids.h"

 
 typedef struct keyring_handle *KEYRING_HANDLE;
 
 
 typedef struct keyring_handle *KEYRING_HANDLE;
 

-int keyring_register_filename (const char *fname, int secret, void **ptr);
+int keyring_register_filename (const char *fname, int read_only, void **ptr);

 int keyring_is_writable (void *token);
 
 int keyring_is_writable (void *token);
 

-KEYRING_HANDLE keyring_new (void *token, int secret);
+KEYRING_HANDLE keyring_new (void *token);

 void keyring_release (KEYRING_HANDLE hd);
 void keyring_release (KEYRING_HANDLE hd);

+void keyring_push_found_state (KEYRING_HANDLE hd);
+void keyring_pop_found_state (KEYRING_HANDLE hd);

 const char *keyring_get_resource_name (KEYRING_HANDLE hd);
 int keyring_lock (KEYRING_HANDLE hd, int yes);
 int keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb);
 const char *keyring_get_resource_name (KEYRING_HANDLE hd);
 int keyring_lock (KEYRING_HANDLE hd, int yes);
 int keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb);