X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.h;h=cabbc1886a35db8e26654690ba065b51f4185db7;hb=a57a146ebc3f15f1ba2dfe8ecb9b59702fb8f799;hp=bbefcc3e3bf3f0deb27ef7433d2c045af18cfd1f;hpb=66748d60571a5ebbbc0f0cb84c061f9c62f5aef7;p=onak.git

diff --git a/merge.h b/merge.h
index bbefcc3..cabbc18 100644
--- a/merge.h
+++ b/merge.h
@@ -3,7 +3,7 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
+ * Copyright 2002-2004 Project Purple
  */
 
 #ifndef __MERGE_H__
@@ -25,18 +25,6 @@
  */
 int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b);
 
-/**
- *	update_keys - Takes a list of public keys and updates them in the DB.
- *	@keys: The keys to update in the DB.
- *
- *	Takes a list of keys and adds them to the database, merging them with
- *	the key in the database if it's already present there. The key list is
- *	update to contain the minimum set of updates required to get from what
- *	we had before to what we have now (ie the set of data that was added to
- *	the DB). Returns the number of entirely new keys added.
- */
-int update_keys(struct openpgp_publickey **keys);
-
 /**
  *	get_signed_packet - Gets a signed packet from a list.
  *	@packet_list: The list of packets to look in.