* keyserver.c (keyserver_spawn): Removed some variables

declaration due to shadowing warnings.
* build-packet.c (build_attribute_subpkt): s/index/idx/ to avoid
compiler warnig due to index(3).
* getkey.c (get_ctx_handle): Use KEYDB_HANDLE as return value.
* keylist.c (list_one): Made resname const.
* keyedit.c (keyedit_menu): Allow "addphoto" only when --openpgp is
not used.
* options.skel: Changed one example photo viewer to qiv.

g10/getkey.c

@@ -2194,7 +2194,7 @@ get_user_id( u32 *keyid, size_t *rn )
     return p;
 }
 
-const char*
+KEYDB_HANDLE
 get_ctx_handle(GETKEY_CTX ctx)
 {
   return ctx->kr_handle;