* 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/keyedit.c

@@ -1029,6 +1029,12 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
 	    break;
 
 	  case cmdADDPHOTO:
+            if (opt.rfc2440)
+              {
+                tty_printf(
+                   _("This command is not allowed while in OpenPGP mode.\n"));
+                break;
+              }
 	    photo=1;
 	    /* fall through */